PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d857636e: am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev

Browse Source 
* commit 'd857636eec3bbb862a9259130fca569c95de3b72':
  Show managed profile under accounts rather than users
This commit is contained in:
Alexandra Gherghina
2014-08-11 09:35:53 +00:00
committed by Android Git Automerger
parent c465b19883 d857636eec
commit 80f5a84bf0
4 changed files with 156 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -4578,6 +4578,10 @@
<string name="sync_is_failing">Sync is currently experiencing problems. It will be back shortly.</string>
<!-- Button label to add an account [CHAR LIMIT=20] -->
<string name="add_account_label">Add account</string>
<!-- Label for the state of the managed profile [CHAR LIMIT=80] -->
<string name="managed_profile_not_available_label">Work profile is not available yet</string>
<!-- Button label to remove the work profile [CHAR LIMIT=35] -->
<string name="remove_managed_profile_label">Remove work profile</string>
<!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
<string name="background_data">Background data</string>
<!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
@@ -5179,8 +5183,6 @@
<string name="user_summary_restricted_profile">Restricted profile</string>
<!-- User settings summary for a managed profile [CHAR LIMIT=50] -->
<string name="user_summary_managed_profile">Managed profile</string>
<!-- User settings summary for an inactive managed profile [CHAR LIMIT=50] -->
<string name="user_summary_managed_profile_not_enabled">Managed profile (currently inactive)</string>
<!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
<string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
<!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->

31
res/xml/account_settings.xml
View File

@@ -19,35 +19,4 @@
android:key="account"
android:title="@string/account_settings_title"
settings:keywords="@string/keywords_accounts">
<Preference
android:key="add_account"
android:title="@string/add_account_label"
android:icon="@drawable/ic_menu_add_dark"
android:order="2147483648" />
<PreferenceCategory
android:key="account_personal"
android:title="@string/category_personal" >
<Preference
android:key="add_account_personal"
android:title="@string/add_account_label"
android:icon="@drawable/ic_menu_add_dark"
android:order="2147483648" />
</PreferenceCategory>
<PreferenceCategory
android:key="account_work"
android:title="@string/category_work" >
<Preference
android:key="add_account_work"
android:title="@string/add_account_label"
android:icon="@drawable/ic_menu_add_dark"
android:order="2147483648" />
</PreferenceCategory>
</PreferenceScreen>