cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move key list logic into fragment, UI fixes for nav drawer

Browse Source
This commit is contained in:
Dominik Schürmann
2015-01-29 10:10:07 +01:00
parent 5564f65a69
commit 43930ed8f2
20 changed files with 61 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 559 B

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 390 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 700 B

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 986 B

BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

18
OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<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/api_apps_list_content" />
</FrameLayout>

11
OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
View File

@@ -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/api_apps_list_content"/>
<include layout="@layout/drawer_list" />
</android.support.v4.widget.FixedDrawerLayout>

24
OpenKeychain/src/main/res/layout/api_apps_list_content.xml
View File

@@ -1,24 +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" />
<FrameLayout
android:layout_below="@id/toolbar"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/crypto_consumers_list_fragment"
android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
</RelativeLayout>

4
OpenKeychain/src/main/res/menu/api_account_settings.xml
View File

@@ -6,9 +6,5 @@
android:id="@+id/menu_account_settings_delete"
android:title="@string/api_settings_delete_account"
app:showAsAction="never" />
<item
android:id="@+id/menu_account_settings_cancel"
android:title="@string/api_settings_cancel"
app:showAsAction="never" />
</menu>