Merge "Merge commit '83eaf6cc' into HEAD" (c37fa833) · Commits · e / os / android_frameworks_base

packages/Keyguard/res/layout/keyguard_host_view.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false">
		android:clipToPadding="false"
		android:importantForAccessibility="yes"> <!-- Needed because TYPE_WINDOW_STATE_CHANGED is sent
		from this view when bouncer is shown -->

		<com.android.keyguard.KeyguardSecurityContainer
		android:id="@+id/keyguard_security_container"

+11 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.util.AttributeSet;
		import android.util.Log;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.accessibility.AccessibilityEvent;
		import android.widget.FrameLayout;

		import com.android.internal.widget.LockPatternUtils;
		@@ -153,6 +154,16 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback {
		return false;
		}

		@Override
		public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
		if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
		event.getText().add(mSecurityContainer.getCurrentSecurityModeContentDescription());
		return true;
		} else {
		return super.dispatchPopulateAccessibilityEvent(event);
		}
		}

		protected KeyguardSecurityContainer getSecurityContainer() {
		return mSecurityContainer;
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,14 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		}
		}

		public CharSequence getCurrentSecurityModeContentDescription() {
		View v = (View) getSecurityView(mCurrentSecuritySelection);
		if (v != null) {
		return v.getContentDescription();
		}
		return "";
		}

		private KeyguardSecurityView getSecurityView(SecurityMode securityMode) {
		final int securityViewIdForMode = getSecurityViewIdForMode(securityMode);
		KeyguardSecurityView view = null;

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityEvent;

		import com.android.internal.widget.LockPatternUtils;
		import com.android.keyguard.KeyguardHostView;
		@@ -85,6 +86,7 @@ public class KeyguardBouncer {
		mKeyguardView.onResume();
		mKeyguardView.startAppearAnimation();
		mShowingSoon = false;
		mKeyguardView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
		}
		};