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/drawable-hdpi/ic_action_discard.png b/app/src/main/res/drawable-hdpi/ic_action_discard.png
new file mode 100644
index 0000000..703b31f
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_edit.png b/app/src/main/res/drawable-hdpi/ic_action_edit.png
new file mode 100644
index 0000000..756db31
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_edit.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_new.png b/app/src/main/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 0000000..d866d61
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_new.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
new file mode 100644
index 0000000..dae2790
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000..54eecde
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_discard.png b/app/src/main/res/drawable-mdpi/ic_action_discard.png
new file mode 100644
index 0000000..248fb09
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_edit.png b/app/src/main/res/drawable-mdpi/ic_action_edit.png
new file mode 100644
index 0000000..68a4532
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_edit.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_new.png b/app/src/main/res/drawable-mdpi/ic_action_new.png
new file mode 100644
index 0000000..f17e798
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_new.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
new file mode 100644
index 0000000..94ab6f4
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000..25c36db
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_discard.png b/app/src/main/res/drawable-xhdpi/ic_action_discard.png
new file mode 100644
index 0000000..9eeeed1
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_edit.png b/app/src/main/res/drawable-xhdpi/ic_action_edit.png
new file mode 100644
index 0000000..67e056f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_edit.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new.png b/app/src/main/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 0000000..dde2141
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_new.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
new file mode 100644
index 0000000..ab4ab9d
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000..425a8bc
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_discard.png b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100644
index 0000000..cb1260a
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_edit.png b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
new file mode 100644
index 0000000..3a241ea
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_new.png b/app/src/main/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 0000000..c42c2bf
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_new.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
new file mode 100644
index 0000000..44ee117
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 0000000..fe5fec4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png
Binary files differ
diff --git a/app/src/main/res/drawable/item_background_activated.xml b/app/src/main/res/drawable/list_item_background_activated.xml
similarity index 100%
rename from app/src/main/res/drawable/item_background_activated.xml
rename to app/src/main/res/drawable/list_item_background_activated.xml
diff --git a/app/src/main/res/drawable/list_item_divider.xml b/app/src/main/res/drawable/list_item_divider.xml
new file mode 100644
index 0000000..f41aabe
--- /dev/null
+++ b/app/src/main/res/drawable/list_item_divider.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetLeft="@dimen/default_padding_left"
+ android:insetRight="@dimen/default_padding_right" >
+
+ <shape>
+ <solid android:color="@color/android_color_gray" />
+ <size android:height="1dp" />
+ </shape>
+
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/layout/create_face.xml b/app/src/main/res/layout/dialog_create_face.xml
similarity index 100%
rename from app/src/main/res/layout/create_face.xml
rename to app/src/main/res/layout/dialog_create_face.xml
diff --git a/app/src/main/res/layout/create_route.xml b/app/src/main/res/layout/dialog_create_route.xml
similarity index 100%
rename from app/src/main/res/layout/create_route.xml
rename to app/src/main/res/layout/dialog_create_route.xml
diff --git a/app/src/main/res/layout/fragment_face_detail.xml b/app/src/main/res/layout/fragment_face_detail_list_header.xml
similarity index 81%
rename from app/src/main/res/layout/fragment_face_detail.xml
rename to app/src/main/res/layout/fragment_face_detail_list_header.xml
index c251036..227891f 100644
--- a/app/src/main/res/layout/fragment_face_detail.xml
+++ b/app/src/main/res/layout/fragment_face_detail_list_header.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
style="@style/default_linear_layout_padding"
>
@@ -14,8 +14,4 @@
style="?android:listSeparatorTextViewStyle"
/>
- <include
- layout="@android:layout/list_content"
- />
-
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_face_list.xml b/app/src/main/res/layout/fragment_face_list_list_header.xml
similarity index 64%
rename from app/src/main/res/layout/fragment_face_list.xml
rename to app/src/main/res/layout/fragment_face_list_list_header.xml
index f7c2388..d44726c 100644
--- a/app/src/main/res/layout/fragment_face_list.xml
+++ b/app/src/main/res/layout/fragment_face_list_list_header.xml
@@ -3,35 +3,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
style="@style/default_linear_layout_padding"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/face_list_actions_title"
- style="?android:listSeparatorTextViewStyle"
- />
-
- <Button
- android:id="@+id/face_list_refresh_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/face_list_refresh_face_list"
- style="@style/default_custom_white_button"
- />
- <Button
- android:id="@+id/face_list_add_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/face_list_add_face"
- style="@style/default_custom_white_button"
- />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:text="@string/face_list_list_of_faces_title"
style="?android:listSeparatorTextViewStyle"
/>
@@ -71,10 +49,6 @@
</LinearLayout>
- <include
- layout="@android:layout/list_content"
- />
-
</FrameLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_logcat_tags_list.xml b/app/src/main/res/layout/fragment_logcat_tags_list.xml
deleted file mode 100644
index 2688e0d..0000000
--- a/app/src/main/res/layout/fragment_logcat_tags_list.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- style="@style/default_linear_layout_padding"
- >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/fragment_logcat_general_operations_category"
- style="?android:listSeparatorTextViewStyle"
- />
-
- <Button
- android:id="@+id/logcat_reset_loglevel_defaults"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/logcat_reset_log_level_defaults"
- style="@style/default_custom_white_button"
- />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/fragment_logcat_tags_n_log_levels"
- style="?android:listSeparatorTextViewStyle"
- />
-
- <include
- layout="@android:layout/list_content"
- />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_face_detail.xml b/app/src/main/res/layout/fragment_logcat_tags_list_header.xml
similarity index 71%
copy from app/src/main/res/layout/fragment_face_detail.xml
copy to app/src/main/res/layout/fragment_logcat_tags_list_header.xml
index c251036..9e81844 100644
--- a/app/src/main/res/layout/fragment_face_detail.xml
+++ b/app/src/main/res/layout/fragment_logcat_tags_list_header.xml
@@ -3,19 +3,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
style="@style/default_linear_layout_padding"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/fragment_face_details_title"
+ android:text="@string/fragment_logcat_tags_n_log_levels"
style="?android:listSeparatorTextViewStyle"
/>
- <include
- layout="@android:layout/list_content"
- />
-
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail_list_header.xml
similarity index 74%
rename from app/src/main/res/layout/fragment_route_detail.xml
rename to app/src/main/res/layout/fragment_route_detail_list_header.xml
index 048b2c5..539e84a 100644
--- a/app/src/main/res/layout/fragment_route_detail.xml
+++ b/app/src/main/res/layout/fragment_route_detail_list_header.xml
@@ -3,22 +3,24 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
style="@style/default_linear_layout_padding"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/fragment_route_details_title"
+ android:text="@string/fragment_route_route_name_title"
style="?android:listSeparatorTextViewStyle"
/>
- <TextView style="@style/default_custom_white_button"
+ <TextView
+ android:id="@+id/route_detail_prefix"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
- android:id="@+id/route_detail_prefix"/>
+ style="@style/default_custom_white_button"
+ />
<TextView
android:layout_width="match_parent"
@@ -27,8 +29,4 @@
style="?android:listSeparatorTextViewStyle"
/>
- <include
- layout="@android:layout/list_content"
- />
-
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_route_list.xml b/app/src/main/res/layout/fragment_route_list_list_header.xml
similarity index 64%
rename from app/src/main/res/layout/fragment_route_list.xml
rename to app/src/main/res/layout/fragment_route_list_list_header.xml
index b1d481b..361cfa2 100644
--- a/app/src/main/res/layout/fragment_route_list.xml
+++ b/app/src/main/res/layout/fragment_route_list_list_header.xml
@@ -3,35 +3,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
style="@style/default_linear_layout_padding"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/route_list_actions_title"
- style="?android:listSeparatorTextViewStyle"
- />
-
- <Button
- android:id="@+id/route_list_refresh_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/route_list_refresh_route_list"
- style="@style/default_custom_white_button"
- />
- <Button
- android:id="@+id/route_list_add_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/route_list_add_route"
- style="@style/default_custom_white_button"
- />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:text="@string/route_list_list_of_routes_title"
style="?android:listSeparatorTextViewStyle"
/>
@@ -71,10 +49,6 @@
</LinearLayout>
- <include
- layout="@android:layout/list_content"
- />
-
</FrameLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_face_generic_item.xml b/app/src/main/res/layout/list_item_face_generic_item.xml
index 7683c68..c4d0737 100644
--- a/app/src/main/res/layout/list_item_face_generic_item.xml
+++ b/app/src/main/res/layout/list_item_face_generic_item.xml
@@ -4,6 +4,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ style="@style/default_linear_layout_padding"
>
<TextView
diff --git a/app/src/main/res/layout/list_item_face_status_item.xml b/app/src/main/res/layout/list_item_face_status_item.xml
index 0b6a1d0..f6c6440 100644
--- a/app/src/main/res/layout/list_item_face_status_item.xml
+++ b/app/src/main/res/layout/list_item_face_status_item.xml
@@ -4,7 +4,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_background_activated"
+ android:background="@drawable/list_item_background_activated"
+ style="@style/default_linear_layout_padding"
>
<TextView
diff --git a/app/src/main/res/layout/list_item_route_info_item.xml b/app/src/main/res/layout/list_item_route_info_item.xml
index 8c2057a..80185a4 100644
--- a/app/src/main/res/layout/list_item_route_info_item.xml
+++ b/app/src/main/res/layout/list_item_route_info_item.xml
@@ -4,7 +4,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_background_activated"
+ android:background="@drawable/list_item_background_activated"
+ style="@style/default_linear_layout_padding"
>
<TextView
diff --git a/app/src/main/res/layout/list_item_route_item.xml b/app/src/main/res/layout/list_item_route_item.xml
index baa6da0..af14e24 100644
--- a/app/src/main/res/layout/list_item_route_item.xml
+++ b/app/src/main/res/layout/list_item_route_item.xml
@@ -4,7 +4,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_background_activated"
+ android:background="@drawable/list_item_background_activated"
+ style="@style/default_linear_layout_padding"
>
<TextView
diff --git a/app/src/main/res/layout/list_item_setting_item.xml b/app/src/main/res/layout/list_item_setting_item.xml
index 4d8498b..2945775 100644
--- a/app/src/main/res/layout/list_item_setting_item.xml
+++ b/app/src/main/res/layout/list_item_setting_item.xml
@@ -4,7 +4,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/item_background_activated"
+ android:background="@drawable/list_item_background_activated"
+ style="@style/default_linear_layout_padding"
>
<TextView
diff --git a/app/src/main/res/layout/status_item.xml b/app/src/main/res/layout/status_item.xml
deleted file mode 100644
index 549de06..0000000
--- a/app/src/main/res/layout/status_item.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/main_fragment_linear_layout">
- <TextView style="@style/main_fragment_list_title"
- android:id="@+id/title" />
-
- <TextView style="@style/main_fragment_list_value"
- android:id="@+id/value" />
-</LinearLayout>
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>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 92b2b4b..0c82fa3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
<resources>
<item name="ndn_color_fire_bush" type="color">#DB9710</item>
<item name="ndn_color_grenadier" type="color">#C04818</item>
+ <item name="android_color_gray" type="color">#C6C6C6</item>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87899fe..9f65d2d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,19 @@
<string name="fragment_face_details_title">Face Details</string>
<string name="menu_item_delete_face_item">Delete</string>
<string name="expire_never">Never</string>
+ <string name="face_id">Face ID</string>
+ <string name="local_face_uri">Local FaceURI</string>
+ <string name="remote_face_uri">Remote FaceURI</string>
+ <string name="expires_in">Expires in</string>
+ <string name="face_scope">Face scope</string>
+ <string name="face_persistency">Face persistency</string>
+ <string name="link_type">Link type</string>
+ <string name="in_interests">In interests</string>
+ <string name="out_interests">Out interests</string>
+ <string name="in_data">In data</string>
+ <string name="out_data">Out data</string>
+ <string name="in_bytes">In bytes</string>
+ <string name="out_bytes">Out bytes</string>
<string-array name="face_scopes">
<item>Local</item>
@@ -56,4 +69,5 @@
<string name="route_add_dialog_create_route">Create route</string>
<string name="fragment_route_details_title">Route Details</string>
<string name="fragment_route_details_next_hops">List of next hops</string>
+ <string name="fragment_route_route_name_title">Route Name</string>
</resources>
diff --git a/app/src/main/res/values/strings_main_activity.xml b/app/src/main/res/values/strings_main_activity.xml
index 8b67095..490efd9 100644
--- a/app/src/main/res/values/strings_main_activity.xml
+++ b/app/src/main/res/values/strings_main_activity.xml
@@ -10,10 +10,6 @@
<string name="pit_entries">PIT Entries</string>
<string name="measurement_entries">Measurement entries</string>
<string name="cs_entries">CS entries</string>
- <string name="in_interests">In interests</string>
- <string name="out_interests">Out interests</string>
- <string name="in_data">In data</string>
- <string name="out_data">Out data</string>
<string-array name="pref_sync_face_titles">
<item>localhost</item>
