diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-14 14:58:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-14 14:58:12 -0700 |
| commit | 7545cff2175830f5cd25b6e06eb61916006f3b8e (patch) | |
| tree | 54c694eb250de7c976a52852e7b05a69e1c592dd /res/layout | |
| parent | 7f7a07d3654d32ceca697be5d49d52d461d3c606 (diff) | |
| parent | 813d23838b76623faa6b2ceb4ad7458cba0f726f (diff) | |
| download | packages_apps_Settings-7545cff2175830f5cd25b6e06eb61916006f3b8e.zip packages_apps_Settings-7545cff2175830f5cd25b6e06eb61916006f3b8e.tar.gz packages_apps_Settings-7545cff2175830f5cd25b6e06eb61916006f3b8e.tar.bz2 | |
am 813d2383: am 00dc15d9: Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev
* commit '813d23838b76623faa6b2ceb4ad7458cba0f726f':
Add a settings icon to restricted profile config header
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preference_user_delete_widget.xml | 2 | ||||
| -rw-r--r-- | res/layout/user_info_header.xml | 8 |
2 files changed, 9 insertions, 1 deletions
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 diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml index 506dd2e2..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" |