Loading core/res/res/values/strings.xml +0 −2 Original line number Diff line number Diff line Loading @@ -5063,8 +5063,6 @@ <!-- Notification action button. Click it will open the bluetooth device details page for this hearing device. It will be shown when making a phone call with the hearing device. [CHAR LIMIT=none] --> <string name="hearing_device_notification_settings_button">Settings</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 <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string> <!-- Message when logging out a user on a split user system --> Loading services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +0 −24 Original line number Diff line number Diff line Loading @@ -2137,9 +2137,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub this, 0, oldUserState.mUserId)); } // Announce user changes only if more than one exist. final boolean announceNewUser = mUserManager.getUsers().size() > 1; // The user changed. mCurrentUserId = userId; AccessibilityUserState userState = getCurrentUserStateLocked(); Loading @@ -2166,13 +2163,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub // As an initialization step, update the shortcuts for the current user. updateShortcutsForCurrentNavigationMode(); if (announceNewUser) { // Schedule announcement of the current user if needed. mMainHandler.sendMessageDelayed( obtainMessage(AccessibilityManagerService::announceNewUserIfNeeded, this), WAIT_FOR_USER_STATE_FULLY_INITIALIZED_MILLIS); } for (IUserInitializationCompleteCallback callback : mUserInitializationCompleteCallbacks) { try { Loading @@ -2186,20 +2176,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } private void announceNewUserIfNeeded() { synchronized (mLock) { AccessibilityUserState userState = getCurrentUserStateLocked(); if (userState.isHandlingAccessibilityEventsLocked()) { String message = mContext.getString(R.string.user_switched, mUserManager.getUserInfo(mCurrentUserId).name); AccessibilityEvent event = AccessibilityEvent.obtain( AccessibilityEvent.TYPE_ANNOUNCEMENT); event.getText().add(message); sendAccessibilityEventLocked(event, mCurrentUserId); } } } private void unlockUser(int userId) { synchronized (mLock) { int parentUserId = mSecurityPolicy.resolveProfileParentLocked(userId); Loading Loading
core/res/res/values/strings.xml +0 −2 Original line number Diff line number Diff line Loading @@ -5063,8 +5063,6 @@ <!-- Notification action button. Click it will open the bluetooth device details page for this hearing device. It will be shown when making a phone call with the hearing device. [CHAR LIMIT=none] --> <string name="hearing_device_notification_settings_button">Settings</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 <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string> <!-- Message when logging out a user on a split user system --> Loading
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +0 −24 Original line number Diff line number Diff line Loading @@ -2137,9 +2137,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub this, 0, oldUserState.mUserId)); } // Announce user changes only if more than one exist. final boolean announceNewUser = mUserManager.getUsers().size() > 1; // The user changed. mCurrentUserId = userId; AccessibilityUserState userState = getCurrentUserStateLocked(); Loading @@ -2166,13 +2163,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub // As an initialization step, update the shortcuts for the current user. updateShortcutsForCurrentNavigationMode(); if (announceNewUser) { // Schedule announcement of the current user if needed. mMainHandler.sendMessageDelayed( obtainMessage(AccessibilityManagerService::announceNewUserIfNeeded, this), WAIT_FOR_USER_STATE_FULLY_INITIALIZED_MILLIS); } for (IUserInitializationCompleteCallback callback : mUserInitializationCompleteCallbacks) { try { Loading @@ -2186,20 +2176,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } } private void announceNewUserIfNeeded() { synchronized (mLock) { AccessibilityUserState userState = getCurrentUserStateLocked(); if (userState.isHandlingAccessibilityEventsLocked()) { String message = mContext.getString(R.string.user_switched, mUserManager.getUserInfo(mCurrentUserId).name); AccessibilityEvent event = AccessibilityEvent.obtain( AccessibilityEvent.TYPE_ANNOUNCEMENT); event.getText().add(message); sendAccessibilityEventLocked(event, mCurrentUserId); } } } private void unlockUser(int userId) { synchronized (mLock) { int parentUserId = mSecurityPolicy.resolveProfileParentLocked(userId); Loading