gui: UI improvements
- Make use of addHeaderView of ListViews, instead of using embedded
ListViews
- Use action bar icons as an entry point for settings, refresh, and add
functions
Change-Id: I6db1cf1a84271a224cf777e06262380afca49709
diff --git a/app/src/main/res/menu/menu_face_list.xml b/app/src/main/res/menu/menu_face_list.xml
new file mode 100644
index 0000000..963dee0
--- /dev/null
+++ b/app/src/main/res/menu/menu_face_list.xml
@@ -0,0 +1,20 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/face_list_refresh"
+ android:icon="@drawable/ic_action_refresh"
+ android:title="@string/face_list_refresh_face_list"
+ android:orderInCategory="100"
+ app:showAsAction="always"
+ />
+
+ <item
+ android:id="@+id/face_list_add"
+ android:icon="@drawable/ic_action_new"
+ android:title="@string/face_list_add_face"
+ android:orderInCategory="100"
+ app:showAsAction="always"
+ />
+
+</menu>
diff --git a/app/src/main/res/menu/menu_face_list_multiple_modal_menu.xml b/app/src/main/res/menu/menu_face_list_multiple_modal_menu.xml
index 1664611..a6b91be 100644
--- a/app/src/main/res/menu/menu_face_list_multiple_modal_menu.xml
+++ b/app/src/main/res/menu/menu_face_list_multiple_modal_menu.xml
@@ -4,9 +4,9 @@
<item
android:id="@+id/menu_item_delete_face_item"
- android:icon="@android:drawable/ic_menu_delete"
+ android:icon="@drawable/ic_action_discard"
android:title="@string/menu_item_delete_face_item"
- app:showAsAction="ifRoom|withText"
+ app:showAsAction="always"
/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_log.xml b/app/src/main/res/menu/menu_log.xml
index a530929..2f7c0a3 100644
--- a/app/src/main/res/menu/menu_log.xml
+++ b/app/src/main/res/menu/menu_log.xml
@@ -1,13 +1,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context=".NfdLogActivity">
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_log_settings"
+ android:icon="@drawable/ic_action_settings"
android:title="@string/log_settings"
android:orderInCategory="100"
- app:showAsAction="never"
+ app:showAsAction="always"
/>
</menu>
diff --git a/app/src/main/res/menu/menu_logcat_settings.xml b/app/src/main/res/menu/menu_logcat_settings.xml
new file mode 100644
index 0000000..86679ea
--- /dev/null
+++ b/app/src/main/res/menu/menu_logcat_settings.xml
@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/action_log_settings"
+ android:icon="@drawable/ic_action_edit"
+ android:title="@string/logcat_reset_log_level_defaults"
+ android:orderInCategory="100"
+ app:showAsAction="always"
+ />
+
+</menu>
diff --git a/app/src/main/res/menu/menu_logcat_settings_multiple_modal_menu.xml b/app/src/main/res/menu/menu_logcat_settings_multiple_modal_menu.xml
index 2bbf336..11aa3d1 100644
--- a/app/src/main/res/menu/menu_logcat_settings_multiple_modal_menu.xml
+++ b/app/src/main/res/menu/menu_logcat_settings_multiple_modal_menu.xml
@@ -4,9 +4,9 @@
<item
android:id="@+id/menu_item_delete_setting_item"
- android:icon="@android:drawable/ic_menu_delete"
+ android:icon="@drawable/ic_action_discard"
android:title="@string/menu_item_delete_setting_item"
- app:showAsAction="ifRoom|withText"
+ app:showAsAction="always"
/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_route_list.xml b/app/src/main/res/menu/menu_route_list.xml
new file mode 100644
index 0000000..4ab170a
--- /dev/null
+++ b/app/src/main/res/menu/menu_route_list.xml
@@ -0,0 +1,20 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/route_list_refresh"
+ android:icon="@drawable/ic_action_refresh"
+ android:title="@string/route_list_refresh_route_list"
+ android:orderInCategory="100"
+ app:showAsAction="always"
+ />
+
+ <item
+ android:id="@+id/route_list_add"
+ android:icon="@drawable/ic_action_new"
+ android:title="@string/route_list_add_route"
+ android:orderInCategory="100"
+ app:showAsAction="always"
+ />
+
+</menu>