diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 13:36:38 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-29 13:36:38 +0100 |
commit | 34b01e9f2b07eef512e5fb453891f7233a685ae8 (patch) | |
tree | e08b7ea53139166993734a5f1c69c8da32bb90cc /OpenKeychain/src/main/res | |
parent | 6a7d33260625ee566ac8a4cc555239226c4bb521 (diff) | |
download | open-keychain-34b01e9f2b07eef512e5fb453891f7233a685ae8.tar.gz open-keychain-34b01e9f2b07eef512e5fb453891f7233a685ae8.tar.bz2 open-keychain-34b01e9f2b07eef512e5fb453891f7233a685ae8.zip |
Remove files related to old nav drawer
Diffstat (limited to 'OpenKeychain/src/main/res')
16 files changed, 52 insertions, 227 deletions
diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml deleted file mode 100644 index 97456301a..000000000 --- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.v4.widget.FixedDrawerLayout - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/drawer_list" /> - - </android.support.v4.widget.FixedDrawerLayout> - - <include layout="@layout/decrypt_overview_fragment" /> - -</FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml deleted file mode 100644 index 4b277c331..000000000 --- a/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.v4.widget.FixedDrawerLayout - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/drawer_list" /> - - </android.support.v4.widget.FixedDrawerLayout> - - <include layout="@layout/encrypt_files_content" /> -</FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml deleted file mode 100644 index 5cf838c46..000000000 --- a/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.v4.widget.FixedDrawerLayout - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/drawer_list" /> - - </android.support.v4.widget.FixedDrawerLayout> - - <include layout="@layout/encrypt_text_content" /> -</FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml deleted file mode 100644 index 039081cd7..000000000 --- a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.v4.widget.FixedDrawerLayout - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/drawer_list" /> - - </android.support.v4.widget.FixedDrawerLayout> - - <include layout="@layout/key_list_content" /> - -</FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml deleted file mode 100644 index d2d2e75fe..000000000 --- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/decrypt_overview_fragment"/> - - <include layout="@layout/drawer_list" /> - -</android.support.v4.widget.FixedDrawerLayout> diff --git a/OpenKeychain/src/main/res/layout/custom_drawer.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml index 021226ba3..021226ba3 100644 --- a/OpenKeychain/src/main/res/layout/custom_drawer.xml +++ b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml diff --git a/OpenKeychain/src/main/res/layout/drawer_list.xml b/OpenKeychain/src/main/res/layout/drawer_list.xml deleted file mode 100644 index ab00c0073..000000000 --- a/OpenKeychain/src/main/res/layout/drawer_list.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - android:layout_gravity="start" tells DrawerLayout to treat - this as a sliding drawer on the left side for left-to-right - languages and on the right side for right-to-left languages. - The drawer is given a fixed width in dp and extends the full height of - the container. A solid background is used for contrast - with the content view. ---> -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/left_drawer" - android:layout_width="@dimen/drawer_size" - android:layout_height="match_parent" - android:layout_gravity="start" - android:background="@color/white" - android:choiceMode="singleChoice" - android:divider="@color/bg_gray" - android:dividerHeight="1dp" /> diff --git a/OpenKeychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml deleted file mode 100644 index 4719483da..000000000 --- a/OpenKeychain/src/main/res/layout/drawer_list_item.xml +++ /dev/null @@ -1,31 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <ImageView - android:id="@+id/drawer_item_icon" - android:gravity="center_vertical" - android:layout_width="30dp" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" /> - - <TextView - android:id="@+id/drawer_item_text" - android:text="Test" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:layout_marginLeft="8dp" - android:paddingBottom="16dp" - android:paddingRight="16dp" - android:paddingTop="16dp" - android:textAppearance="@android:style/TextAppearance.Medium" - android:textColor="#111" - android:layout_alignParentTop="true" - android:layout_toRightOf="@id/drawer_item_icon"/> - -</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml index cdcf4fa43..401b1c36e 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml @@ -1,14 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.FixedDrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/drawer_layout" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <LinearLayout + android:layout_below="@id/toolbar" + android:id="@+id/content_frame" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.EncryptFileActivity"> + android:orientation="vertical"> + + <include layout="@layout/notify_area" /> - <include layout="@layout/encrypt_files_content"/> + <FrameLayout + android:id="@+id/encrypt_pager_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> - <include layout="@layout/drawer_list" /> + <fragment + android:id="@+id/encrypt_file_fragment" + android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> -</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml deleted file mode 100644 index 61c7e69c9..000000000 --- a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/toolbar" - layout="@layout/toolbar" /> - - <LinearLayout - android:layout_below="@id/toolbar" - android:id="@+id/content_frame" - android:layout_marginLeft="@dimen/drawer_content_padding" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include layout="@layout/notify_area" /> - - <FrameLayout - android:id="@+id/encrypt_pager_mode" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - - <fragment - android:id="@+id/encrypt_file_fragment" - android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - </LinearLayout> -</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml index 5d5e16131..0459fa3d7 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml @@ -1,14 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.FixedDrawerLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/drawer_layout" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <LinearLayout + android:layout_below="@id/toolbar" + android:id="@+id/content_frame" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.EncryptTextActivity"> + android:orientation="vertical"> + + <include layout="@layout/notify_area" /> - <include layout="@layout/encrypt_text_content"/> + <FrameLayout + android:id="@+id/encrypt_pager_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> - <include layout="@layout/drawer_list" /> + <fragment + android:id="@+id/encrypt_text_fragment" + android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> -</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml deleted file mode 100644 index 31ebef798..000000000 --- a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/toolbar" - layout="@layout/toolbar" /> - - <LinearLayout - android:layout_below="@id/toolbar" - android:id="@+id/content_frame" - android:layout_marginLeft="@dimen/drawer_content_padding" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include layout="@layout/notify_area" /> - - <FrameLayout - android:id="@+id/encrypt_pager_mode" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - - <fragment - android:id="@+id/encrypt_text_fragment" - android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - </LinearLayout> -</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml deleted file mode 100644 index 03ef85381..000000000 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/key_list_content" /> - - <include layout="@layout/drawer_list" /> - -</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml index 7179793b5..293c45e1c 100644 --- a/OpenKeychain/src/main/res/layout/key_list_content.xml +++ b/OpenKeychain/src/main/res/layout/key_list_content.xml @@ -17,7 +17,6 @@ <LinearLayout android:id="@+id/content_frame" - android:layout_marginLeft="@dimen/drawer_content_padding" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/values-large/dimens.xml b/OpenKeychain/src/main/res/values-large/dimens.xml index 192a4bb99..045e125f3 100644 --- a/OpenKeychain/src/main/res/values-large/dimens.xml +++ b/OpenKeychain/src/main/res/values-large/dimens.xml @@ -1,4 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="drawer_content_padding">240dp</dimen> </resources> diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index e1a7749f0..55344e519 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -1,5 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="drawer_size">240dp</dimen> - <dimen name="drawer_content_padding">0dp</dimen> </resources>
\ No newline at end of file |