Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74d0c39 authored Nov 02, 2012 by Svetoslav Ganov Committed by Android (Google) Code Review Nov 02, 2012

Merge "Polish user selector accessibility." into jb-mr1-lockscreen-dev

parents 383df1e7 fc9c4cd5

core/java/android/view/accessibility/AccessibilityRecord.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,17 @@ public class AccessibilityRecord {
		mSourceNodeId, GET_SOURCE_PREFETCH_FLAGS);
		}

		/**
		* Sets the window id.
		*
		* @param windowId The window id.
		*
		* @hide
		*/
		public void setWindowId(int windowId) {
		mSourceWindowId = windowId;
		}

		/**
		* Gets the id of the window from which the event comes from.
		*

policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,11 @@ class KeyguardMultiUserAvatar extends FrameLayout {
		if (active) {
		KeyguardLinearLayout parent = (KeyguardLinearLayout) getParent();
		parent.setTopChild(this);
		// TODO: Create an appropriate asset when string changes are possible.
		setContentDescription(mUserName.getText()
		+ ". " + mContext.getString(R.string.user_switched, ""));
		} else {
		setContentDescription(mUserName.getText());
		}
		}
		updateVisualsForActive(mActive, animate, SWITCH_ANIMATION_DURATION, onComplete);

services/java/com/android/server/accessibility/AccessibilityManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1351,6 +1351,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		AccessibilityEvent event = AccessibilityEvent.obtain(
		AccessibilityEvent.TYPE_ANNOUNCEMENT);
		event.getText().add(message);
		event.setWindowId(mSecurityPolicy.getRetrievalAllowingWindowLocked());
		sendAccessibilityEvent(event, mCurrentUserId);
		}
		}