diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-08-11 09:26:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-08 20:34:05 +0000 |
| commit | ad54ba7030be6654bd76b3ee1a001d388130bcac (patch) | |
| tree | 78a2584bb79ab0b02dc8ebe61f2f55c4bc86dd0d /res | |
| parent | 59f01b9b585c374fadb935fb115b4ad34b100eb4 (diff) | |
| parent | 83adb564de5ee7f6c3155f98befb2e449b7b4f6f (diff) | |
| download | packages_apps_Settings-ad54ba7030be6654bd76b3ee1a001d388130bcac.zip packages_apps_Settings-ad54ba7030be6654bd76b3ee1a001d388130bcac.tar.gz packages_apps_Settings-ad54ba7030be6654bd76b3ee1a001d388130bcac.tar.bz2 | |
Merge "Show managed profile under accounts rather than users" into lmp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/account_settings.xml | 31 |
2 files changed, 4 insertions, 33 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 90580e1..d921d46 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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] --> diff --git a/res/xml/account_settings.xml b/res/xml/account_settings.xml index 7437b80..33f61a2 100644 --- a/res/xml/account_settings.xml +++ b/res/xml/account_settings.xml @@ -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> |