diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-06-11 17:40:55 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-06-11 17:40:55 -0700 |
commit | c4cfca112c442861260f54f581e9e2d14d103c34 (patch) | |
tree | d278c0f1ea0e9a0f6d6fa9d269ea5aa61ce59455 /res/menu | |
parent | 4b7213dba44fed876aebb8821c38923182ca5e47 (diff) | |
parent | 3fc67575b4047005482321c940429cc4eb420a12 (diff) | |
download | dsub-c4cfca112c442861260f54f581e9e2d14d103c34.tar.gz dsub-c4cfca112c442861260f54f581e9e2d14d103c34.tar.bz2 dsub-c4cfca112c442861260f54f581e9e2d14d103c34.zip |
Merge branch 'Admin'
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/admin.xml | 12 | ||||
-rw-r--r-- | res/menu/admin_context.xml | 16 | ||||
-rw-r--r-- | res/menu/admin_context_user.xml | 8 | ||||
-rw-r--r-- | res/menu/empty.xml | 3 | ||||
-rw-r--r-- | res/menu/user.xml | 24 | ||||
-rw-r--r-- | res/menu/user_user.xml | 14 |
6 files changed, 77 insertions, 0 deletions
diff --git a/res/menu/admin.xml b/res/menu/admin.xml new file mode 100644 index 00000000..f16e89f7 --- /dev/null +++ b/res/menu/admin.xml @@ -0,0 +1,12 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:compat="http://schemas.android.com/apk/res-auto">
+ <item
+ android:id="@+id/menu_add_user"
+ android:title="@string/menu.add_user"
+ android:icon="?attr/add_person"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_exit"
+ android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml new file mode 100644 index 00000000..922a24a9 --- /dev/null +++ b/res/menu/admin_context.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/admin_change_email"
+ android:title="@string/admin.change_email"/>
+
+ <item
+ android:id="@+id/admin_change_password"
+ android:title="@string/admin.change_password"/>
+
+ <item
+ android:id="@+id/admin_delete_user"
+ android:title="@string/admin.delete_user"/>
+</menu>
diff --git a/res/menu/admin_context_user.xml b/res/menu/admin_context_user.xml new file mode 100644 index 00000000..cc4c1ab9 --- /dev/null +++ b/res/menu/admin_context_user.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/admin_change_password"
+ android:title="@string/admin.change_password"/>
+</menu>
\ No newline at end of file diff --git a/res/menu/empty.xml b/res/menu/empty.xml index cf7b82de..7abe954b 100644 --- a/res/menu/empty.xml +++ b/res/menu/empty.xml @@ -2,4 +2,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/menu_exit" + android:title="@string/menu.exit"/> </menu> diff --git a/res/menu/user.xml b/res/menu/user.xml new file mode 100644 index 00000000..aea881fc --- /dev/null +++ b/res/menu/user.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/menu_update_permissions"
+ android:title="@string/admin.update_permissions"
+ android:icon="?attr/save"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_change_password"
+ android:title="@string/admin.change_password"
+ android:icon="?attr/password"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_change_email"
+ android:title="@string/admin.change_email"/>
+
+ <item
+ android:id="@+id/menu_exit"
+ android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file diff --git a/res/menu/user_user.xml b/res/menu/user_user.xml new file mode 100644 index 00000000..f66aa793 --- /dev/null +++ b/res/menu/user_user.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/menu_change_password"
+ android:title="@string/admin.change_password"
+ android:icon="?attr/password"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_exit"
+ android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file |