summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-07-25 12:52:29 -0700
committerAmith Yamasani <yamasani@google.com>2014-07-26 14:09:43 +0000
commit247520c369370885a1c085e53ee679dce0fd55ce (patch)
tree88d2600f9bf63a04e8088ecf78427062e443f7ec /res/layout
parent2d4d9a9067a2904ed75247f83b0f37a086a020b2 (diff)
downloadpackages_apps_Settings-247520c369370885a1c085e53ee679dce0fd55ce.zip
packages_apps_Settings-247520c369370885a1c085e53ee679dce0fd55ce.tar.gz
packages_apps_Settings-247520c369370885a1c085e53ee679dce0fd55ce.tar.bz2
More User Settings improvements
Add a menu checkbox to allow creation of users from lockscreen. Add a delete icon in restricted profiles settings. Other little fixes to icons. Update some strings based on feedback. Bug: 15761405 Bug: 16550371 Bug: 16298824 Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/preference_home_app.xml2
-rw-r--r--res/layout/preference_user_delete_widget.xml2
-rw-r--r--res/layout/user_info_header.xml8
3 files changed, 7 insertions, 5 deletions
diff --git a/res/layout/preference_home_app.xml b/res/layout/preference_home_app.xml
index 8418161..0ee154e 100644
--- a/res/layout/preference_home_app.xml
+++ b/res/layout/preference_home_app.xml
@@ -71,7 +71,7 @@
android:layout_height="fill_parent"
android:paddingStart="12dip"
android:paddingEnd="12dp"
- android:src="@drawable/ic_menu_delete_holo_dark"
+ android:src="@drawable/ic_menu_delete"
android:contentDescription="@string/home_app_uninstall_button"
android:layout_gravity="center"
android:clickable="true"
diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_delete_widget.xml
index 7d563f8..9c1ba72 100644
--- a/res/layout/preference_user_delete_widget.xml
+++ b/res/layout/preference_user_delete_widget.xml
@@ -50,7 +50,7 @@
android:layout_height="fill_parent"
android:paddingStart="16dip"
android:paddingEnd="16dip"
- android:src="@drawable/ic_menu_delete_holo_dark"
+ android:src="@drawable/ic_menu_delete"
android:contentDescription="@string/user_delete_user_description"
android:layout_gravity="center"
android:background="?android:attr/selectableItemBackground" />
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index aeecc58..35cc466 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -80,13 +80,15 @@
android:maxLines="4" />
</RelativeLayout>
<ImageView
+ android:id="@+id/delete"
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"/>
+ android:src="@drawable/ic_menu_delete"
+ android:contentDescription="@string/user_delete_user_description"
+ android:layout_gravity="center"
+ android:background="?android:attr/selectableItemBackground" />
</LinearLayout>
<View android:layout_width="match_parent"
android:layout_height="2dp"