openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add feature flag to disable light status bar" into ub-launcher3-calgary-polish

This commit is contained in:
Tony Wickham 2016-10-13 00:41:57 +00:00 committed by Android (Google) Code Review
parent cf6195268d 0fed55bf03
commit 1d29c6f7d2
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Launcher.java
View File

@ -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) {

16
src/com/android/launcher3/dynamicui/ColorExtractionService.java
View File

@ -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.

2
src/com/android/launcher3/dynamicui/ExtractedColors.java
View File

@ -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 = ",";

2
src_config/com/android/launcher3/config/FeatureFlags.java
View File

@ -37,4 +37,6 @@ public final class FeatureFlags {
public static final boolean NO_ALL_APPS_ICON = true;
// When enabled fling down gesture on the first workspace triggers search.
public static final boolean PULLDOWN_SEARCH = false;
// When enabled the status bar may show dark icons based on the top of the wallpaper.
public static final boolean LIGHT_STATUS_BAR = false;
}