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

Merge "Fixed a bug with talkback where the panel could be expanded" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-04-07 19:54:16 +00:00
committed by Android (Google) Code Review
parent 7323fa91f5 529c5325f0
commit 64954eb772
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -845,15 +845,19 @@ public abstract class PanelView extends FrameLayout {
}; };
public void cancelPeek() { public void cancelPeek() {
boolean cancelled = mPeekPending;
if (mPeekAnimator != null) { if (mPeekAnimator != null) {
cancelled = true;
mPeekAnimator.cancel(); mPeekAnimator.cancel();
} }
removeCallbacks(mPeekRunnable); removeCallbacks(mPeekRunnable);
mPeekPending = false; mPeekPending = false;
// When peeking, we already tell mBar that we expanded ourselves. Make sure that we also if (cancelled) {
// notify mBar that we might have closed ourselves. // When peeking, we already tell mBar that we expanded ourselves. Make sure that we also
notifyBarPanelExpansionChanged(); // notify mBar that we might have closed ourselves.
notifyBarPanelExpansionChanged();
}
} }
public void expand(final boolean animate) { public void expand(final boolean animate) {

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
View File

@@ -41,7 +41,9 @@ public class PhoneStatusBarView extends PanelBar {
private Runnable mHideExpandedRunnable = new Runnable() { private Runnable mHideExpandedRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
mBar.makeExpandedInvisible(); if (mPanelFraction == 0.0f) {
mBar.makeExpandedInvisible();
}
} }
}; };
@@ -135,6 +137,7 @@ public class PhoneStatusBarView extends PanelBar {
super.onTrackingStarted(); super.onTrackingStarted();
mBar.onTrackingStarted(); mBar.onTrackingStarted();
mScrimController.onTrackingStarted(); mScrimController.onTrackingStarted();
removePendingHideExpandedRunnables();
} }
@Override @Override