aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 01:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 9311387 to ub-launcher3-master

Browse Source 
Change-Id: I449cd2c91c2906f04ebf844eab2d02befaeb2f4d
This commit is contained in:
Tony Wickham
2016-09-28 14:40:28 -07:00
parent 02aa0e4792 9311387a22
commit 0bc9e98d78
5 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/launcher3/allapps/AllAppsTransitionController.java
View File

@@ -86,8 +86,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
private AnimatorSet mCurrentAnimation;
private boolean mNoIntercept;
private boolean mLightStatusBar;
// Used in discovery bounce animation to provide the transition without workspace changing.
private boolean mIsTranslateWithoutWorkspace = false;
private AnimatorSet mDiscoBounceAnimation;
@@ -273,26 +271,14 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
private void updateLightStatusBar(float shift) {
boolean enable = shift <= mStatusBarHeight / 2;
// Do not modify status bar on landscape as all apps is not full bleed.
if (mLauncher.getDeviceProfile().isVerticalBarLayout()) {
return;
}
// Already set correctly
if (mLightStatusBar == enable) {
return;
}
int systemUiFlags = mLauncher.getWindow().getDecorView().getSystemUiVisibility();
if (enable) {
mLauncher.getWindow().getDecorView().setSystemUiVisibility(systemUiFlags
| View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
} else {
mLauncher.getWindow().getDecorView().setSystemUiVisibility(systemUiFlags
& ~(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR));
}
mLightStatusBar = enable;
// Use a light status bar (dark icons) if all apps is behind at least half of the status
// bar. If the status bar is already light due to wallpaper extraction, keep it that way.
boolean enable = shift <= mStatusBarHeight / 2 || mLauncher.shouldBeLightStatusBar();
mLauncher.setLightStatusBar(enable);
}
/**