Skip to content

Commit

Permalink
More styling and menu fixes, preferences work now with some exceptions.
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpoole committed May 3, 2016
1 parent 5981d5e commit ba1eb08
Show file tree
Hide file tree
Showing 33 changed files with 335 additions and 1,016 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Expand Up @@ -48,11 +48,11 @@

<activity
android:name=".prefs.PrefEditor"
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompatPrefs"
/>
<activity
android:name=".prefs.AdvancedPrefEditor"
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompatPrefs"
android:label="@string/app_name_version"
/>
<activity
Expand Down
1 change: 1 addition & 0 deletions lint.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="AppCompatResource" severity="ignore" />
<issue id="MissingTranslation" severity="warning" />
</lint>
4 changes: 3 additions & 1 deletion project.properties
Expand Up @@ -14,4 +14,6 @@ target=android-23
apk-configurations=


android.library.reference.1=../../workspace/android-support-v7-appcompat
android.library.reference.1=..\\..\\workspace\\android-support-v7-appcompat
android.library.reference.2=..\\..\\workspace\\android-support-v7-preference
android.library.reference.3=../../workspace/android-support-v7-recyclerview
82 changes: 0 additions & 82 deletions res/layout-v17/preference_list_fragment.xml

This file was deleted.

82 changes: 0 additions & 82 deletions res/layout/preference_list_fragment.xml

This file was deleted.

24 changes: 12 additions & 12 deletions res/menu-v11/main_menu.xml
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>

<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_undo"
android:title="@string/undo"
android:alphabeticShortcut="@string/shortcut_undo"
android:icon="?attr/menu_undo"
android:showAsAction="ifRoom"
app:showAsAction="always"
android:actionLayout="@layout/undo_action_view"
/>

<item
android:id="@+id/menu_camera"
android:title="@string/menu_camera"
android:icon="?attr/menu_camera"
android:showAsAction="always"
app:showAsAction="always"
/>
<item
android:id="@+id/menu_voice"
android:title="@string/menu_voice_commands"
android:icon="?attr/mic"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_gps"
android:title="@string/menu_gps"
android:icon="?attr/menu_gps"
android:showAsAction="ifRoom"
>

app:showAsAction="ifRoom"
>
<menu>
<item
android:id="@+id/menu_gps_show"
Expand Down Expand Up @@ -86,7 +86,7 @@
android:id="@+id/menu_transfer"
android:title="@string/menu_transfer"
android:icon="?attr/menu_transfer"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
>
<menu>
<item
Expand Down Expand Up @@ -161,13 +161,13 @@
android:id="@+id/menu_config"
android:title="@string/menu_config"
android:icon="?attr/menu_config"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_tools"
android:title="@string/menu_tools"
android:icon="?attr/menu_tools"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
>
<menu>
<item
Expand Down Expand Up @@ -200,13 +200,13 @@
android:id="@+id/menu_find"
android:title="@string/menu_find"
android:icon="?attr/menu_find"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_help"
android:title="@string/menu_help"
android:alphabeticShortcut="@string/shortcut_help"
android:icon="?attr/menu_help"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
</menu>
7 changes: 4 additions & 3 deletions res/menu/help_menu.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="schemas.android.com/apk/res-auto">
<item
android:id="@+id/help_menu_back"
android:icon="?attr/menu_back"
android:showAsAction="always"
app:showAsAction="always"
android:title="@string/back"
/>
<item
android:id="@+id/help_menu_forward"
android:icon="?attr/menu_forward"
android:showAsAction="always"
app:showAsAction="always"
android:title="@string/forward"
/>
</menu>
21 changes: 11 additions & 10 deletions res/menu/main_menu.xml
@@ -1,32 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>

<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_undo"
android:title="@string/undo"
android:alphabeticShortcut="@string/shortcut_undo"
android:icon="?attr/menu_undo"
android:showAsAction="ifRoom"
app:showAsAction="always"
android:actionLayout="@layout/undo_action_view"
/>

<item
android:id="@+id/menu_camera"
android:title="@string/menu_camera"
android:icon="?attr/menu_camera"
android:showAsAction="always"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_voice"
android:title="@string/menu_voice_commands"
android:icon="?attr/mic"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_gps"
android:title="@string/menu_gps"
android:icon="?attr/menu_gps"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
>

<menu>
Expand Down Expand Up @@ -81,7 +82,7 @@
android:id="@+id/menu_transfer"
android:title="@string/menu_transfer"
android:icon="?attr/menu_transfer"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
>
<menu>
<item
Expand Down Expand Up @@ -147,13 +148,13 @@
android:id="@+id/menu_config"
android:title="@string/menu_config"
android:icon="?attr/menu_config"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_tools"
android:title="@string/menu_tools"
android:icon="?attr/menu_tools"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
>
<menu>
<item
Expand Down Expand Up @@ -186,13 +187,13 @@
android:id="@+id/menu_find"
android:title="@string/menu_find"
android:icon="?attr/menu_find"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
<item
android:id="@+id/menu_help"
android:title="@string/menu_help"
android:alphabeticShortcut="@string/shortcut_help"
android:icon="?attr/menu_help"
android:showAsAction="ifRoom"
app:showAsAction="ifRoom"
/>
</menu>

0 comments on commit ba1eb08

Please sign in to comment.