diff options
| author | Tony Wickham <twickham@google.com> | 2016-10-13 00:53:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 00:53:13 +0000 |
| commit | 7061c9788f9e974a6a32534af3686f8fbfcffba0 (patch) | |
| tree | 650b8d96b151e914424de26353e23e3da57766cd /src/com/android/launcher3/dynamicui | |
| parent | 33f0a768ef74877628fd51072681d24bbd92370b (diff) | |
| parent | 0fed55bf031087474a3833a3e28f4263c8dc7959 (diff) | |
| download | android_packages_apps_Trebuchet-7061c9788f9e974a6a32534af3686f8fbfcffba0.tar.gz android_packages_apps_Trebuchet-7061c9788f9e974a6a32534af3686f8fbfcffba0.tar.bz2 android_packages_apps_Trebuchet-7061c9788f9e974a6a32534af3686f8fbfcffba0.zip | |
Add feature flag to disable light status bar
am: 0fed55bf03
Change-Id: Ia42af86a0e052bb05f0ed2ce6e8372b4408fed13
Diffstat (limited to 'src/com/android/launcher3/dynamicui')
| -rw-r--r-- | src/com/android/launcher3/dynamicui/ColorExtractionService.java | 16 | ||||
| -rw-r--r-- | src/com/android/launcher3/dynamicui/ExtractedColors.java | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/com/android/launcher3/dynamicui/ColorExtractionService.java b/src/com/android/launcher3/dynamicui/ColorExtractionService.java index c15b71040..1369f609d 100644 --- a/src/com/android/launcher3/dynamicui/ColorExtractionService.java +++ b/src/com/android/launcher3/dynamicui/ColorExtractionService.java @@ -27,6 +27,7 @@ import android.support.v7.graphics.Palette; import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; +import com.android.launcher3.config.FeatureFlags; /** * Extracts colors from the wallpaper, and saves results to {@link LauncherProvider}. @@ -62,12 +63,15 @@ public class ColorExtractionService extends IntentService { .generate(); extractedColors.updateHotseatPalette(hotseatPalette); - int statusBarHeight = getResources().getDimensionPixelSize(R.dimen.status_bar_height); - Palette statusBarPalette = Palette.from(wallpaper) - .setRegion(0, 0, wallpaper.getWidth(), statusBarHeight) - .clearFilters() - .generate(); - extractedColors.updateStatusBarPalette(statusBarPalette); + if (FeatureFlags.LIGHT_STATUS_BAR) { + int statusBarHeight = getResources() + .getDimensionPixelSize(R.dimen.status_bar_height); + Palette statusBarPalette = Palette.from(wallpaper) + .setRegion(0, 0, wallpaper.getWidth(), statusBarHeight) + .clearFilters() + .generate(); + extractedColors.updateStatusBarPalette(statusBarPalette); + } } // Save the extracted colors and wallpaper id to LauncherProvider. diff --git a/src/com/android/launcher3/dynamicui/ExtractedColors.java b/src/com/android/launcher3/dynamicui/ExtractedColors.java index 4db0797c0..6a3011d3b 100644 --- a/src/com/android/launcher3/dynamicui/ExtractedColors.java +++ b/src/com/android/launcher3/dynamicui/ExtractedColors.java @@ -47,7 +47,7 @@ public class ExtractedColors { // public static final int MUTED_LIGHT_INDEX = 7; public static final int NUM_COLOR_PROFILES = 2; - private static final int VERSION = 2; + private static final int VERSION = 1; private static final String COLOR_SEPARATOR = ","; |