commit e5fc407146c3f09e3bcd55d907fdffe2d26f3c6d
author Amith Yamasani <yamasani@google.com> Thu May 16 00:01:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 16 00:01:42 2013 +0000
tree d66e9fb61a4486089faae39f19d7fe62419b5583
parent 00dc15d9dab780e9a61d1b3a20446d6519b5b076
parent 8d26ba45e36f8ce9a7117662e83832aa08ad923d

Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev

res/layout/preference_user_delete_widget.xml

diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_delete_widget.xml
index 6ee6faa..7d563f8 100644
--- a/res/layout/preference_user_delete_widget.xml
+++ b/res/layout/preference_user_delete_widget.xml
@@ -34,7 +34,7 @@
         android:paddingStart="16dip"
         android:paddingEnd="16dip"
         android:src="@drawable/ic_sysbar_quicksettings"
-        android:contentDescription="@string/user_delete_user_description"
+        android:contentDescription="@string/settings_label"
         android:layout_gravity="center"
         android:background="?android:attr/selectableItemBackground" />
     <View

res/layout/user_info_header.xml

diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index 506dd2e..c698eaf 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -79,6 +79,14 @@
                 android:text="@string/user_summary_restricted_profile"
                 android:maxLines="4" />
         </RelativeLayout>
+        <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:paddingStart="16dip"
+                android:paddingEnd="16dip"
+                android:src="@drawable/ic_sysbar_quicksettings"
+                android:contentDescription="@string/settings_label"
+                android:layout_gravity="center"/>
     </LinearLayout>
     <View android:layout_width="match_parent"
           android:layout_height="2dp"