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

sysui: refactor for extension.

Browse Source 
refactor status bar transition mode computation
logic into separate method.

Bug: 28942131
Change-Id: I5f46b6964ab431f009afcb9caf41e69e345090dd
(cherry picked from commit d8c64f23ea7020f9043a8e462b0903131560a875)
This commit is contained in:
Muyuan Li
2016-05-26 16:46:50 -07:00
parent 470baf3664
commit 62e72f77a7
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2862,9 +2862,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
// update status bar mode
final int sbMode = computeBarMode(oldVal, newVal, mStatusBarView.getBarTransitions(),
View.STATUS_BAR_TRANSIENT, View.STATUS_BAR_TRANSLUCENT,
View.STATUS_BAR_TRANSPARENT);
final int sbMode = computeStatusBarMode(oldVal, newVal);
// update navigation bar mode
final int nbMode = mNavigationBarView == null ? -1 : computeBarMode(
@@ -2911,7 +2909,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mask, fullscreenStackBounds, dockedStackBounds, sbModeChanged, mStatusBarMode);
}
private int computeBarMode(int oldVis, int newVis, BarTransitions transitions,
protected int computeStatusBarMode(int oldVal, int newVal) {
return computeBarMode(oldVal, newVal, getStatusBarTransitions(),
View.STATUS_BAR_TRANSIENT, View.STATUS_BAR_TRANSLUCENT,
View.STATUS_BAR_TRANSPARENT);
}
protected BarTransitions getStatusBarTransitions() {
return mStatusBarView.getBarTransitions();
}
protected int computeBarMode(int oldVis, int newVis, BarTransitions transitions,
int transientFlag, int translucentFlag, int transparentFlag) {
final int oldMode = barMode(oldVis, transientFlag, translucentFlag, transparentFlag);
final int newMode = barMode(newVis, transientFlag, translucentFlag, transparentFlag);
@@ -2933,7 +2941,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
private void checkBarModes() {
if (mDemoMode) return;
checkBarMode(mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions(),
checkBarMode(mStatusBarMode, mStatusBarWindowState, getStatusBarTransitions(),
mNoAnimationOnNextBarModeChange);
if (mNavigationBarView != null) {
checkBarMode(mNavigationBarMode,