aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <harsh@prjkt.io>2018-04-29 01:47:33 +0530
committerHarsh Shandilya <harsh@prjkt.io>2018-04-30 17:30:24 +0530
commit10efbb8b6b9a124f080817459d6c28fd24566712 (patch)
treea10d16fbb5ff78fd3f659f5967d94024cae26133
parentwg: Add and use dummy AppTheme (diff)
downloadwireguard-android-10efbb8b6b9a124f080817459d6c28fd24566712.tar.xz
wireguard-android-10efbb8b6b9a124f080817459d6c28fd24566712.zip
wg: Migrate menu visibility to AppCompat
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
-rw-r--r--app/src/main/res/menu/config_editor.xml7
-rw-r--r--app/src/main/res/menu/main_activity.xml7
-rw-r--r--app/src/main/res/menu/tunnel_detail.xml7
-rw-r--r--app/src/main/res/menu/tunnel_list_action_mode.xml7
4 files changed, 16 insertions, 12 deletions
diff --git a/app/src/main/res/menu/config_editor.xml b/app/src/main/res/menu/config_editor.xml
index 44e719c7..bb58f6c9 100644
--- a/app/src/main/res/menu/config_editor.xml
+++ b/app/src/main/res/menu/config_editor.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_action_save"
android:alphabeticShortcut="s"
android:icon="@drawable/ic_action_save"
- android:showAsAction="always"
- android:title="@string/save" />
+ android:title="@string/save"
+ app:showAsAction="always" />
</menu>
diff --git a/app/src/main/res/menu/main_activity.xml b/app/src/main/res/menu/main_activity.xml
index 462558ec..54211ec4 100644
--- a/app/src/main/res/menu/main_activity.xml
+++ b/app/src/main/res/menu/main_activity.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_settings"
android:alphabeticShortcut="s"
android:icon="@drawable/ic_settings"
- android:showAsAction="never"
- android:title="@string/settings" />
+ android:title="@string/settings"
+ app:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/menu/tunnel_detail.xml b/app/src/main/res/menu/tunnel_detail.xml
index c00c1603..8e2c2eb9 100644
--- a/app/src/main/res/menu/tunnel_detail.xml
+++ b/app/src/main/res/menu/tunnel_detail.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_action_edit"
android:alphabeticShortcut="e"
android:icon="@drawable/ic_action_edit"
- android:showAsAction="always"
- android:title="@string/edit" />
+ android:title="@string/edit"
+ app:showAsAction="always" />
</menu>
diff --git a/app/src/main/res/menu/tunnel_list_action_mode.xml b/app/src/main/res/menu/tunnel_list_action_mode.xml
index 7896d522..6d175573 100644
--- a/app/src/main/res/menu/tunnel_list_action_mode.xml
+++ b/app/src/main/res/menu/tunnel_list_action_mode.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_action_delete"
android:alphabeticShortcut="d"
android:icon="@drawable/ic_action_delete"
- android:showAsAction="always"
- android:title="@string/delete" />
+ android:title="@string/delete"
+ app:showAsAction="always" />
</menu>