Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 30ed33b1: Merge "Owner should not be announces as a user switch." into jb-mr1-dev

Browse Source 
* commit '30ed33b141dd1add916466c193b6735cd0bf8315':
  Owner should not be announces as a user switch.
This commit is contained in:
Svetoslav Ganov
2012-10-01 23:33:27 -07:00
committed by Android Git Automerger
parent a640417078 30ed33b141
commit ef89d33f5b
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -3933,6 +3933,6 @@
<!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] --> <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
<string name="enable_accessibility_canceled">Accessibility canceled.</string> <string name="enable_accessibility_canceled">Accessibility canceled.</string>
<!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] --> <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
<string name="user_switched">Switched to user <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string> <string name="user_switched">Current user <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string>
</resources> </resources>

14
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -111,7 +111,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
// TODO: This is arbitrary. When there is time implement this by watching // TODO: This is arbitrary. When there is time implement this by watching
// when that accessibility services are bound. // when that accessibility services are bound.
private static final int WAIT_FOR_USER_STATE_FULLY_INITIALIZED_MILLIS = 5000; private static final int WAIT_FOR_USER_STATE_FULLY_INITIALIZED_MILLIS = 3000;
private static final String FUNCTION_REGISTER_UI_TEST_AUTOMATION_SERVICE = private static final String FUNCTION_REGISTER_UI_TEST_AUTOMATION_SERVICE =
"registerUiTestAutomationService"; "registerUiTestAutomationService";
@@ -659,6 +659,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
oldUserState.mUserId, 0).sendToTarget(); oldUserState.mUserId, 0).sendToTarget();
} }
// Announce user changes only if more that one exist.
UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
final boolean announceNewUser = userManager.getUsers().size() > 1;
// The user changed. // The user changed.
mCurrentUserId = userId; mCurrentUserId = userId;
@@ -666,9 +670,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
mMainHandler.obtainMessage(MainHandler.MSG_SEND_RECREATE_INTERNAL_STATE, mMainHandler.obtainMessage(MainHandler.MSG_SEND_RECREATE_INTERNAL_STATE,
mCurrentUserId, 0).sendToTarget(); mCurrentUserId, 0).sendToTarget();
// Schedule announcement of the current user if needed. if (announceNewUser) {
mMainHandler.sendEmptyMessageDelayed(MainHandler.MSG_ANNOUNCE_NEW_USER_IF_NEEDED, // Schedule announcement of the current user if needed.
WAIT_FOR_USER_STATE_FULLY_INITIALIZED_MILLIS); mMainHandler.sendEmptyMessageDelayed(MainHandler.MSG_ANNOUNCE_NEW_USER_IF_NEEDED,
WAIT_FOR_USER_STATE_FULLY_INITIALIZED_MILLIS);
}
} }
} }