diff options
| author | Tony Wickham <twickham@google.com> | 2016-10-13 00:41:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-13 00:41:57 +0000 |
| commit | 1d29c6f7d2fab3c55ac2267957eb3cba3f7eddab (patch) | |
| tree | ad444dfcf85d3324f71179ec2c4305c9f3f30f9a /src/com/android/launcher3/Launcher.java | |
| parent | cf6195268d3c1f190318b3220d321fb910349e51 (diff) | |
| parent | 0fed55bf031087474a3833a3e28f4263c8dc7959 (diff) | |
| download | android_packages_apps_Trebuchet-1d29c6f7d2fab3c55ac2267957eb3cba3f7eddab.tar.gz android_packages_apps_Trebuchet-1d29c6f7d2fab3c55ac2267957eb3cba3f7eddab.tar.bz2 android_packages_apps_Trebuchet-1d29c6f7d2fab3c55ac2267957eb3cba3f7eddab.zip | |
Merge "Add feature flag to disable light status bar" into ub-launcher3-calgary-polish
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index c73a7a61d..544aef2b0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -499,9 +499,9 @@ public class Launcher extends Activity * @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; + boolean lightStatusBar = activate || (FeatureFlags.LIGHT_STATUS_BAR + && mExtractedColors.getColor(ExtractedColors.STATUS_BAR_INDEX, + ExtractedColors.DEFAULT_DARK) == ExtractedColors.DEFAULT_LIGHT); int oldSystemUiFlags = getWindow().getDecorView().getSystemUiVisibility(); int newSystemUiFlags = oldSystemUiFlags; if (lightStatusBar) { |