diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-08-22 09:27:25 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-08-22 13:00:22 -0700 |
| commit | 7805a10c86a2de9fb5ddf41d63075eef342a59ea (patch) | |
| tree | 7738ac612f111f3841ed25ccf71a7990056e7767 /core | |
| parent | 9edf297055b4fbc5d5f6dacc469fa87fc1cb5370 (diff) | |
| download | frameworks_base-7805a10c86a2de9fb5ddf41d63075eef342a59ea.zip frameworks_base-7805a10c86a2de9fb5ddf41d63075eef342a59ea.tar.gz frameworks_base-7805a10c86a2de9fb5ddf41d63075eef342a59ea.tar.bz2 | |
Show a user switching dialog before starting the user switch
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.
Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 7809c71..0a395e1 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2869,7 +2869,7 @@ android:label="@string/managed_profile_label"> </activity-alias> <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity" - android:theme="@style/Theme.Holo.Dialog" + android:theme="@style/Theme.Material.Dialog" android:label="@string/heavy_weight_switcher_title" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index bbbe1ae..1453e15 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4543,6 +4543,8 @@ <string name="enable_accessibility_canceled">Accessibility canceled.</string> <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] --> <string name="user_switched">Current user <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string> + <!-- Message shown when switching to a user [CHAR LIMIT=none] --> + <string name="user_switching_message">Switching to user <xliff:g id="name" example="Bob">%1$s</xliff:g></string> <!-- Default name of the owner user [CHAR LIMIT=20] --> <string name="owner_name" msgid="3879126011135546571">Owner</string> <!-- Error message title [CHAR LIMIT=35] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ed7afeb..aabdd26 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -836,6 +836,7 @@ <java-symbol type="string" name="time_picker_increment_set_pm_button" /> <java-symbol type="string" name="upload_file" /> <java-symbol type="string" name="user_switched" /> + <java-symbol type="string" name="user_switching_message" /> <java-symbol type="string" name="volume_alarm" /> <java-symbol type="string" name="volume_icon_description_bluetooth" /> <java-symbol type="string" name="volume_icon_description_incall" /> |