summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-09-29 01:27:07 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-29 01:27:07 (GMT)
commitf0fc3c467407c00d71162af931456fd66dfdf1ec (patch)
treea7f81a0c397407f25741d49654663c5db5b24dac
parentd5e1ca2d056f5422409dea1417f3f28d09038a14 (diff)
parent345bff3ce671c62094a8afb5958a361db645f3cf (diff)
downloadandroid_packages_apps_Trebuchet-f0fc3c467407c00d71162af931456fd66dfdf1ec.zip
android_packages_apps_Trebuchet-f0fc3c467407c00d71162af931456fd66dfdf1ec.tar.gz
android_packages_apps_Trebuchet-f0fc3c467407c00d71162af931456fd66dfdf1ec.tar.bz2
Merge "Some minor fixes for extracted status bar." into ub-launcher3-calgary-polish
-rw-r--r--src/com/android/launcher3/Launcher.java38
-rw-r--r--src/com/android/launcher3/allapps/AllAppsTransitionController.java4
2 files changed, 21 insertions, 21 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ae2b7ea..c73a7a6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -280,7 +280,6 @@ public class Launcher extends Activity
private boolean mVisible;
private boolean mHasFocus;
private boolean mAttached;
- private boolean mIsLightStatusBar;
/** Maps launcher activity components to their list of shortcut ids. */
private MultiHashMap<ComponentKey, String> mDeepShortcutMap = new MultiHashMap<>();
@@ -485,33 +484,34 @@ public class Launcher extends Activity
private void loadExtractedColorsAndColorItems() {
// TODO: do this in pre-N as well, once the extraction part is complete.
- if (mExtractedColors != null && Utilities.isNycOrAbove()) {
+ if (Utilities.isNycOrAbove()) {
mExtractedColors.load(this);
mHotseat.updateColor(mExtractedColors, !mPaused);
mWorkspace.getPageIndicator().updateColor(mExtractedColors);
- setLightStatusBar(shouldBeLightStatusBar());
+ // It's possible that All Apps is visible when this is run,
+ // so always use light status bar in that case.
+ activateLightStatusBar(isAllAppsVisible());
}
}
- /** Returns whether a light status bar (dark icons) should be used based on the wallpaper. */
- public boolean shouldBeLightStatusBar() {
- return mExtractedColors.getColor(ExtractedColors.STATUS_BAR_INDEX,
- ExtractedColors.DEFAULT_LIGHT) == ExtractedColors.DEFAULT_LIGHT;
- }
-
- public void setLightStatusBar(boolean lightStatusBar) {
- // Already set correctly
- if (mIsLightStatusBar == lightStatusBar) {
- return;
- }
- mIsLightStatusBar = lightStatusBar;
- int systemUiFlags = getWindow().getDecorView().getSystemUiVisibility();
+ /**
+ * Sets the status bar to be light or not. Light status bar means dark icons.
+ * @param activate if true, make sure the status bar is light, otherwise base on wallpaper.
+ */
+ public void activateLightStatusBar(boolean activate) {
+ boolean lightStatusBar = activate
+ || mExtractedColors.getColor(ExtractedColors.STATUS_BAR_INDEX,
+ ExtractedColors.DEFAULT_DARK) == ExtractedColors.DEFAULT_LIGHT;
+ int oldSystemUiFlags = getWindow().getDecorView().getSystemUiVisibility();
+ int newSystemUiFlags = oldSystemUiFlags;
if (lightStatusBar) {
- systemUiFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+ newSystemUiFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
} else {
- systemUiFlags &= ~(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+ newSystemUiFlags &= ~(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+ }
+ if (newSystemUiFlags != oldSystemUiFlags) {
+ getWindow().getDecorView().setSystemUiVisibility(newSystemUiFlags);
}
- getWindow().getDecorView().setSystemUiVisibility(systemUiFlags);
}
private LauncherCallbacks mLauncherCallbacks;
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index fb15afe..8bbb29b 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -277,8 +277,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
// 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);
+ boolean forceLight = shift <= mStatusBarHeight / 2;
+ mLauncher.activateLightStatusBar(forceLight);
}
/**