From 609194fae2332e6f2ccd7a4464bfa492ad661a6f Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Mon, 1 Jan 2018 02:06:37 -0600
Subject: Serviceless rewrite, part 1

Signed-off-by: Samuel Holland <samuel@sholland.org>
---
 app/src/main/res/menu/config_detail.xml           | 9 ---------
 app/src/main/res/menu/config_edit.xml             | 9 ---------
 app/src/main/res/menu/config_editor.xml           | 9 +++++++++
 app/src/main/res/menu/config_list_delete.xml      | 9 ---------
 app/src/main/res/menu/main.xml                    | 9 ---------
 app/src/main/res/menu/main_activity.xml           | 9 +++++++++
 app/src/main/res/menu/tunnel_detail.xml           | 9 +++++++++
 app/src/main/res/menu/tunnel_list_action_mode.xml | 9 +++++++++
 8 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/res/menu/config_detail.xml
 delete mode 100644 app/src/main/res/menu/config_edit.xml
 create mode 100644 app/src/main/res/menu/config_editor.xml
 delete mode 100644 app/src/main/res/menu/config_list_delete.xml
 delete mode 100644 app/src/main/res/menu/main.xml
 create mode 100644 app/src/main/res/menu/main_activity.xml
 create mode 100644 app/src/main/res/menu/tunnel_detail.xml
 create mode 100644 app/src/main/res/menu/tunnel_list_action_mode.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/config_detail.xml b/app/src/main/res/menu/config_detail.xml
deleted file mode 100644
index c00c1603..00000000
--- a/app/src/main/res/menu/config_detail.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu 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" />
-</menu>
diff --git a/app/src/main/res/menu/config_edit.xml b/app/src/main/res/menu/config_edit.xml
deleted file mode 100644
index 44e719c7..00000000
--- a/app/src/main/res/menu/config_edit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu 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" />
-</menu>
diff --git a/app/src/main/res/menu/config_editor.xml b/app/src/main/res/menu/config_editor.xml
new file mode 100644
index 00000000..44e719c7
--- /dev/null
+++ b/app/src/main/res/menu/config_editor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu 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" />
+</menu>
diff --git a/app/src/main/res/menu/config_list_delete.xml b/app/src/main/res/menu/config_list_delete.xml
deleted file mode 100644
index 7896d522..00000000
--- a/app/src/main/res/menu/config_list_delete.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu 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" />
-</menu>
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
deleted file mode 100644
index 462558ec..00000000
--- a/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu 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" />
-</menu>
diff --git a/app/src/main/res/menu/main_activity.xml b/app/src/main/res/menu/main_activity.xml
new file mode 100644
index 00000000..462558ec
--- /dev/null
+++ b/app/src/main/res/menu/main_activity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu 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" />
+</menu>
diff --git a/app/src/main/res/menu/tunnel_detail.xml b/app/src/main/res/menu/tunnel_detail.xml
new file mode 100644
index 00000000..c00c1603
--- /dev/null
+++ b/app/src/main/res/menu/tunnel_detail.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu 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" />
+</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
new file mode 100644
index 00000000..7896d522
--- /dev/null
+++ b/app/src/main/res/menu/tunnel_list_action_mode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu 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" />
+</menu>
-- 
cgit v1.2.3-59-g8ed1b