summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/dynamicui
diff options
context:
space:
mode:
authorMario Bertschler <bmario@google.com>2017-01-30 17:05:24 -0800
committerMario Bertschler <bmario@google.com>2017-05-03 10:32:57 -0700
commit48198d004af64d0d7c8b86bc243087f68dc374c9 (patch)
tree503173ab33803b465990dff9ed62a8731d5f7e80 /src/com/android/launcher3/dynamicui
parent2526ba8215976432806c69c468f7b556e7877513 (diff)
downloadandroid_packages_apps_Trebuchet-48198d004af64d0d7c8b86bc243087f68dc374c9.tar.gz
android_packages_apps_Trebuchet-48198d004af64d0d7c8b86bc243087f68dc374c9.tar.bz2
android_packages_apps_Trebuchet-48198d004af64d0d7c8b86bc243087f68dc374c9.zip
All Apps transition with gradient and scrim.
The transition is behind a feature flag and turned off by default. Change-Id: I155840ba82b5a573d874376797db5f739a52d706
Diffstat (limited to 'src/com/android/launcher3/dynamicui')
-rw-r--r--src/com/android/launcher3/dynamicui/ColorExtractionService.java13
-rw-r--r--src/com/android/launcher3/dynamicui/ExtractedColors.java28
2 files changed, 36 insertions, 5 deletions
diff --git a/src/com/android/launcher3/dynamicui/ColorExtractionService.java b/src/com/android/launcher3/dynamicui/ColorExtractionService.java
index 9379a7285..f6b02aa9c 100644
--- a/src/com/android/launcher3/dynamicui/ColorExtractionService.java
+++ b/src/com/android/launcher3/dynamicui/ColorExtractionService.java
@@ -63,8 +63,11 @@ public class ColorExtractionService extends IntentService {
// We can't extract colors from live wallpapers, so just use the default color always.
extractedColors.updateHotseatPalette(null);
- if (FeatureFlags.QSB_IN_HOTSEAT) {
+ if (FeatureFlags.QSB_IN_HOTSEAT || FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) {
extractedColors.updateWallpaperThemePalette(null);
+ if (FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) {
+ extractedColors.updateAllAppsGradientPalette(null);
+ }
}
} else {
// We extract colors for the hotseat and status bar separately,
@@ -75,8 +78,12 @@ public class ColorExtractionService extends IntentService {
extractedColors.updateStatusBarPalette(getStatusBarPalette());
}
- if (FeatureFlags.QSB_IN_HOTSEAT) {
- extractedColors.updateWallpaperThemePalette(getWallpaperPalette());
+ if (FeatureFlags.QSB_IN_HOTSEAT || FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) {
+ Palette wallpaperPalette = getWallpaperPalette();
+ extractedColors.updateWallpaperThemePalette(wallpaperPalette);
+ if (FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) {
+ extractedColors.updateAllAppsGradientPalette(wallpaperPalette);
+ }
}
}
diff --git a/src/com/android/launcher3/dynamicui/ExtractedColors.java b/src/com/android/launcher3/dynamicui/ExtractedColors.java
index 2e52a0b8c..3c4aba130 100644
--- a/src/com/android/launcher3/dynamicui/ExtractedColors.java
+++ b/src/com/android/launcher3/dynamicui/ExtractedColors.java
@@ -18,6 +18,7 @@ package com.android.launcher3.dynamicui;
import android.content.Context;
import android.graphics.Color;
+import android.support.annotation.Nullable;
import android.support.v4.graphics.ColorUtils;
import android.support.v7.graphics.Palette;
import android.util.Log;
@@ -42,12 +43,24 @@ public class ExtractedColors {
public static final int HOTSEAT_INDEX = 1;
public static final int STATUS_BAR_INDEX = 2;
public static final int WALLPAPER_VIBRANT_INDEX = 3;
+ public static final int ALLAPPS_GRADIENT_MAIN_INDEX = 4;
+ public static final int ALLAPPS_GRADIENT_SECONDARY_INDEX = 5;
private static final int VERSION;
private static final int[] DEFAULT_VALUES;
static {
- if (FeatureFlags.QSB_IN_HOTSEAT) {
+ if (FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) {
+ VERSION = 3;
+ DEFAULT_VALUES = new int[] {
+ VERSION, // VERSION_INDEX
+ 0x40FFFFFF, // HOTSEAT_INDEX: White with 25% alpha
+ DEFAULT_DARK, // STATUS_BAR_INDEX
+ 0xFFCCCCCC, // WALLPAPER_VIBRANT_INDEX
+ 0xFF000000, // ALLAPPS_GRADIENT_MAIN_INDEX
+ 0xFF000000 // ALLAPPS_GRADIENT_SECONDARY_INDEX
+ };
+ } else if (FeatureFlags.QSB_IN_HOTSEAT) {
VERSION = 2;
DEFAULT_VALUES = new int[] {
VERSION, // VERSION_INDEX
@@ -142,9 +155,20 @@ public class ExtractedColors {
DEFAULT_LIGHT : DEFAULT_DARK);
}
- public void updateWallpaperThemePalette(Palette wallpaperPalette) {
+ public void updateWallpaperThemePalette(@Nullable Palette wallpaperPalette) {
int defaultColor = DEFAULT_VALUES[WALLPAPER_VIBRANT_INDEX];
setColorAtIndex(WALLPAPER_VIBRANT_INDEX, wallpaperPalette == null
? defaultColor : wallpaperPalette.getVibrantColor(defaultColor));
}
+
+ public void updateAllAppsGradientPalette(@Nullable Palette wallpaperPalette) {
+ // TODO b/37089857 will be modified to take the system extracted colors into account
+ int idx;
+ idx = ALLAPPS_GRADIENT_MAIN_INDEX;
+ setColorAtIndex(idx, wallpaperPalette == null
+ ? DEFAULT_VALUES[idx] : wallpaperPalette.getDarkVibrantColor(DEFAULT_VALUES[idx]));
+ idx = ALLAPPS_GRADIENT_SECONDARY_INDEX;
+ setColorAtIndex(idx, wallpaperPalette == null
+ ? DEFAULT_VALUES[idx] : wallpaperPalette.getVibrantColor(DEFAULT_VALUES[idx]));
+ }
}