am ed0cf41d: am 99bde108: Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev

* commit 'ed0cf41d3a36769b0f7b539e0456aff9d1795339':
  Final refactoring of the user/profile settings screen.
This commit is contained in:
Amith Yamasani
2013-04-23 18:53:26 -07:00
committed by Android Git Automerger
5 changed files with 191 additions and 132 deletions

View File

@@ -19,25 +19,13 @@
android:title="@string/user_settings_title">
<PreferenceCategory
android:key="trusted_user_list"
android:title="@string/user_trusted_list_title">
android:key="user_list"
android:title="@string/user_list_title">
</PreferenceCategory>
<Preference
android:key="user_add_trusted"
android:title="@string/user_add_trusted"
android:summary="@string/user_add_trusted_summary"
android:icon="@drawable/ic_menu_add" />
<PreferenceCategory
android:key="limited_user_list"
android:title="@string/user_limited_list_title">
</PreferenceCategory>
<Preference
android:key="user_add_restricted"
android:title="@string/user_add_restricted"
android:summary="@string/user_add_restricted_summary"
android:key="user_add"
android:title="@string/user_add_user_menu"
android:icon="@drawable/ic_menu_add" />
</PreferenceScreen>