From de81b9b43c92a6a8a1403c4547dc44dd17b9792e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 9 Jun 2014 22:20:22 -0700
Subject: #171 Add a full UserFragment to view/edit settings

---
 res/menu/admin_context.xml |  4 ----
 res/menu/user.xml          | 14 ++++++++++++++
 res/values/strings.xml     |  2 ++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 res/menu/user.xml

(limited to 'res')

diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml
index e4948acd..8cd04859 100644
--- a/res/menu/admin_context.xml
+++ b/res/menu/admin_context.xml
@@ -2,10 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">
 
-	<item
-		android:id="@+id/admin_update_permissions"
-		android:title="@string/admin.update_permissions"/>
-
 	<item
 		android:id="@+id/admin_change_password"
 		android:title="@string/admin.change_password"/>
diff --git a/res/menu/user.xml b/res/menu/user.xml
new file mode 100644
index 00000000..ace011b1
--- /dev/null
+++ b/res/menu/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_update_permissions"
+		android:title="@string/admin.update_permissions"
+		android:icon="?attr/save"
+		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/values/strings.xml b/res/values/strings.xml
index add99c11..460e46db 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -448,6 +448,8 @@
 	<string name="share.delete">Delete Share</string>
 
 	<string name="admin.update_permissions">Update Permissions</string>
+	<string name="admin.update_permissions_success">Successfully updated permission for %1$s</string>
+	<string name="admin.update_permissions_error">Failed to update permissions for %1$s</string>
 	<string name="admin.change_password">Change Password</string>
 	<string name="admin.change_password_success">Successfully changed password for %1$s</string>
 	<string name="admin.change_password_error">Failed to change password for %1$s</string>
-- 
cgit v1.2.3