reorder menus, cleanup code, add experimental tab activity

This commit is contained in:
Dominik Schürmann
2014-01-07 22:40:18 +01:00
parent 44117fb191
commit caf3b02042
13 changed files with 314 additions and 402 deletions

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/lists_tabs_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</LinearLayout>

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/menu_key_list_public_import"
android:showAsAction="always|withText"
android:title="@string/menu_import"/>
<item
android:id="@+id/menu_key_list_public_export"
android:showAsAction="never"
android:title="@string/menu_export_keys"/>
</menu>

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/menu_key_list_secret_create"
android:showAsAction="always|withText"
android:title="@string/menu_create_key"/>
<item
android:id="@+id/menu_key_list_secret_create_expert"
android:showAsAction="never"
android:title="@string/menu_create_key_expert"/>
<item
android:id="@+id/menu_key_list_secret_import"
android:showAsAction="never"
android:title="@string/menu_import"/>
<item
android:id="@+id/menu_key_list_secret_export"
android:showAsAction="never"
android:title="@string/menu_export_keys"/>
</menu>

View File

@@ -52,9 +52,6 @@
<item
android:id="@+id/menu_key_view_delete"
android:showAsAction="never"
android:title="@string/menu_delete_key">
<menu>
</menu>
</item>
android:title="@string/menu_delete_key"/>
</menu>

View File

@@ -83,6 +83,7 @@
<string name="menu_api_app_settings">Registered Apps</string>
<string name="menu_import_from_file">Import from file</string>
<string name="menu_import_from_qr_code">Import from QR Code</string>
<string name="menu_import">Import</string>
<string name="menu_import_from_nfc">Import from NFC</string>
<string name="menu_export_keys">Export all keys</string>
<string name="menu_export_key">Export to file</string>
@@ -101,7 +102,7 @@
<string name="menu_sign_key">Sign key</string>
<string name="menu_beam_preferences">Beam settings</string>
<string name="menu_key_edit_cancel">Cancel</string>
<!-- label -->
<string name="label_sign">Sign</string>
<string name="label_message">Message</string>