Merge "Fixed a bug with talkback where the panel could be expanded" into nyc-dev (64954eb7) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -845,16 +845,20 @@ public abstract class PanelView extends FrameLayout {
		};

		public void cancelPeek() {
		boolean cancelled = mPeekPending;
		if (mPeekAnimator != null) {
		cancelled = true;
		mPeekAnimator.cancel();
		}
		removeCallbacks(mPeekRunnable);
		mPeekPending = false;

		if (cancelled) {
		// When peeking, we already tell mBar that we expanded ourselves. Make sure that we also
		// notify mBar that we might have closed ourselves.
		notifyBarPanelExpansionChanged();
		}
		}

		public void expand(final boolean animate) {
		if (!isFullyCollapsed() && !isCollapsing()) {

+4 −1

Original line number	Diff line number	Diff line
		@@ -41,8 +41,10 @@ public class PhoneStatusBarView extends PanelBar {
		private Runnable mHideExpandedRunnable = new Runnable() {
		@Override
		public void run() {
		if (mPanelFraction == 0.0f) {
		mBar.makeExpandedInvisible();
		}
		}
		};

		public PhoneStatusBarView(Context context, AttributeSet attrs) {
		@@ -135,6 +137,7 @@ public class PhoneStatusBarView extends PanelBar {
		super.onTrackingStarted();
		mBar.onTrackingStarted();
		mScrimController.onTrackingStarted();
		removePendingHideExpandedRunnables();
		}

		@Override