From 18c699fbc5f6d8bef4c09f4779d3d63772781ca4 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 3 May 2018 16:58:41 -0700 Subject: [PATCH] Using the system color extraction logic instead of inbuild logic > Moving the inbuild color extraction logic to the aosp flavor Bug: 79111591 Change-Id: I766b0397da7224b424cd5f309cedf635d60a5e0f --- AndroidManifest-common.xml | 2 +- quickstep/AndroidManifest.xml | 7 ++ quickstep/libs/sysui_shared.jar | Bin 124254 -> 125835 bytes .../uioverrides/WallpaperColorInfo.java | 115 ++++++++++++++++++ .../launcher3/BaseDraggingActivity.java | 2 +- .../launcher3/graphics/ColorScrim.java | 2 +- .../graphics/WorkspaceAndHotseatScrim.java | 2 +- .../WorkspacePageIndicator.java | 2 +- .../uioverrides}/WallpaperColorInfo.java | 29 ++++- .../dynamicui/ColorExtractionAlgorithm.java | 3 +- .../dynamicui}/WallpaperColorsCompat.java | 2 +- .../dynamicui}/WallpaperManagerCompat.java | 2 +- .../dynamicui}/WallpaperManagerCompatVL.java | 4 +- .../WallpaperManagerCompatVOMR1.java | 3 +- 14 files changed, 156 insertions(+), 19 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java rename {src/com/android/launcher3/dynamicui => src_ui_overrides/com/android/launcher3/uioverrides}/WallpaperColorInfo.java (76%) rename {src/com/android/launcher3 => src_ui_overrides/com/android/launcher3/uioverrides}/dynamicui/ColorExtractionAlgorithm.java (99%) rename {src/com/android/launcher3/compat => src_ui_overrides/com/android/launcher3/uioverrides/dynamicui}/WallpaperColorsCompat.java (96%) rename {src/com/android/launcher3/compat => src_ui_overrides/com/android/launcher3/uioverrides/dynamicui}/WallpaperManagerCompat.java (97%) rename {src/com/android/launcher3/compat => src_ui_overrides/com/android/launcher3/uioverrides/dynamicui}/WallpaperManagerCompatVL.java (98%) rename {src/com/android/launcher3/compat => src_ui_overrides/com/android/launcher3/uioverrides/dynamicui}/WallpaperManagerCompatVOMR1.java (98%) diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index fe8d65e3b1..211e1ff37f 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -81,7 +81,7 @@ diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index c76ad83655..ac389062ca 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -19,6 +19,7 @@ --> @@ -70,6 +71,12 @@ + + + + diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 120d6f98df81065879162bd31f5f177920634da5..398bd3c466a889c2e906c0331b5f35f6dd50e6e9 100644 GIT binary patch delta 3916 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 Br`Z4i diff --git a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java new file mode 100644 index 0000000000..8218517dcc --- /dev/null +++ b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfo.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.uioverrides; + +import static android.app.WallpaperManager.FLAG_SYSTEM; + +import android.annotation.TargetApi; +import android.app.WallpaperColors; +import android.app.WallpaperManager; +import android.app.WallpaperManager.OnColorsChangedListener; +import android.content.Context; +import android.os.Build; +import android.os.Handler; +import android.os.Looper; + +import com.android.systemui.shared.system.TonalCompat; +import com.android.systemui.shared.system.TonalCompat.ExtractionInfo; + +import java.util.ArrayList; + +@TargetApi(Build.VERSION_CODES.P) +public class WallpaperColorInfo implements OnColorsChangedListener { + + private static final Object sInstanceLock = new Object(); + private static WallpaperColorInfo sInstance; + + public static WallpaperColorInfo getInstance(Context context) { + synchronized (sInstanceLock) { + if (sInstance == null) { + sInstance = new WallpaperColorInfo(context.getApplicationContext()); + } + return sInstance; + } + } + + private final ArrayList mListeners = new ArrayList<>(); + private final WallpaperManager mWallpaperManager; + private final TonalCompat mTonalCompat; + + private ExtractionInfo mExtractionInfo; + + private OnChangeListener[] mTempListeners = new OnChangeListener[0]; + + private WallpaperColorInfo(Context context) { + mWallpaperManager = context.getSystemService(WallpaperManager.class); + mTonalCompat = new TonalCompat(context); + + mWallpaperManager.addOnColorsChangedListener(this, new Handler(Looper.getMainLooper())); + update(mWallpaperManager.getWallpaperColors(FLAG_SYSTEM)); + } + + public int getMainColor() { + return mExtractionInfo.mainColor; + } + + public int getSecondaryColor() { + return mExtractionInfo.secondaryColor; + } + + public boolean isDark() { + return mExtractionInfo.supportsDarkTheme; + } + + public boolean supportsDarkText() { + return mExtractionInfo.supportsDarkText; + } + + @Override + public void onColorsChanged(WallpaperColors colors, int which) { + if ((which & FLAG_SYSTEM) != 0) { + update(colors); + notifyChange(); + } + } + + private void update(WallpaperColors wallpaperColors) { + mExtractionInfo = mTonalCompat.extractDarkColors(wallpaperColors); + } + + public void addOnChangeListener(OnChangeListener listener) { + mListeners.add(listener); + } + + public void removeOnChangeListener(OnChangeListener listener) { + mListeners.remove(listener); + } + + private void notifyChange() { + // Create a new array to avoid concurrent modification when the activity destroys itself. + mTempListeners = mListeners.toArray(mTempListeners); + for (OnChangeListener listener : mTempListeners) { + if (listener != null) { + listener.onExtractedColorsChanged(this); + } + } + } + + public interface OnChangeListener { + void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo); + } +} diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index bde9ad3109..1400432c92 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -34,7 +34,7 @@ import android.widget.Toast; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.badge.BadgeInfo; import com.android.launcher3.compat.LauncherAppsCompat; -import com.android.launcher3.dynamicui.WallpaperColorInfo; +import com.android.launcher3.uioverrides.WallpaperColorInfo; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.views.BaseDragLayer; diff --git a/src/com/android/launcher3/graphics/ColorScrim.java b/src/com/android/launcher3/graphics/ColorScrim.java index 1ffce18232..96d93d83b1 100644 --- a/src/com/android/launcher3/graphics/ColorScrim.java +++ b/src/com/android/launcher3/graphics/ColorScrim.java @@ -23,7 +23,7 @@ import android.view.animation.Interpolator; import com.android.launcher3.R; import com.android.launcher3.anim.Interpolators; -import com.android.launcher3.dynamicui.WallpaperColorInfo; +import com.android.launcher3.uioverrides.WallpaperColorInfo; /** * Simple scrim which draws a color diff --git a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java index 2318a778bb..5c991e9667 100644 --- a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java +++ b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java @@ -34,7 +34,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; -import com.android.launcher3.dynamicui.WallpaperColorInfo; +import com.android.launcher3.uioverrides.WallpaperColorInfo; /** * View scrim which draws behind hotseat and workspace diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java index 1383f53aba..654e593354 100644 --- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java +++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java @@ -24,7 +24,7 @@ import com.android.launcher3.Insettable; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.dynamicui.WallpaperColorInfo; +import com.android.launcher3.uioverrides.WallpaperColorInfo; /** * A PageIndicator that briefly shows a fraction of a line when moving between pages diff --git a/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java b/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java similarity index 76% rename from src/com/android/launcher3/dynamicui/WallpaperColorInfo.java rename to src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java index 32605a2ebe..21070941bc 100644 --- a/src/com/android/launcher3/dynamicui/WallpaperColorInfo.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/WallpaperColorInfo.java @@ -1,11 +1,28 @@ -package com.android.launcher3.dynamicui; +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.uioverrides; import android.content.Context; import android.graphics.Color; import android.util.Pair; -import com.android.launcher3.compat.WallpaperColorsCompat; -import com.android.launcher3.compat.WallpaperManagerCompat; +import com.android.launcher3.uioverrides.dynamicui.WallpaperColorsCompat; +import com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompat; +import com.android.launcher3.uioverrides.dynamicui.ColorExtractionAlgorithm; import java.util.ArrayList; @@ -78,10 +95,10 @@ public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChange } mSupportsDarkText = wallpaperColors != null ? (wallpaperColors.getColorHints() - & WallpaperColorsCompat.HINT_SUPPORTS_DARK_TEXT) > 0 : false; + & WallpaperColorsCompat.HINT_SUPPORTS_DARK_TEXT) > 0 : false; mIsDark = wallpaperColors != null ? (wallpaperColors.getColorHints() - & WallpaperColorsCompat.HINT_SUPPORTS_DARK_THEME) > 0 : false; + & WallpaperColorsCompat.HINT_SUPPORTS_DARK_THEME) > 0 : false; } public void addOnChangeListener(OnChangeListener listener) { @@ -107,4 +124,4 @@ public class WallpaperColorInfo implements WallpaperManagerCompat.OnColorsChange public interface OnChangeListener { void onExtractedColorsChanged(WallpaperColorInfo wallpaperColorInfo); } -} +} \ No newline at end of file diff --git a/src/com/android/launcher3/dynamicui/ColorExtractionAlgorithm.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java similarity index 99% rename from src/com/android/launcher3/dynamicui/ColorExtractionAlgorithm.java rename to src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java index baedf90630..0444212b85 100644 --- a/src/com/android/launcher3/dynamicui/ColorExtractionAlgorithm.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/ColorExtractionAlgorithm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.dynamicui; +package com.android.launcher3.uioverrides.dynamicui; import android.content.Context; import android.graphics.Color; @@ -27,7 +27,6 @@ import android.util.Range; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.compat.WallpaperColorsCompat; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/com/android/launcher3/compat/WallpaperColorsCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java similarity index 96% rename from src/com/android/launcher3/compat/WallpaperColorsCompat.java rename to src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java index e25b9d929a..d984a840d6 100644 --- a/src/com/android/launcher3/compat/WallpaperColorsCompat.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperColorsCompat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.compat; +package com.android.launcher3.uioverrides.dynamicui; /** * A compatibility layer around platform implementation of WallpaperColors diff --git a/src/com/android/launcher3/compat/WallpaperManagerCompat.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java similarity index 97% rename from src/com/android/launcher3/compat/WallpaperManagerCompat.java rename to src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java index 6605acecdb..5c533ff343 100644 --- a/src/com/android/launcher3/compat/WallpaperManagerCompat.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.compat; +package com.android.launcher3.uioverrides.dynamicui; import android.content.Context; import android.support.annotation.Nullable; diff --git a/src/com/android/launcher3/compat/WallpaperManagerCompatVL.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java similarity index 98% rename from src/com/android/launcher3/compat/WallpaperManagerCompatVL.java rename to src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java index 299f09021a..4a8bbbd5af 100644 --- a/src/com/android/launcher3/compat/WallpaperManagerCompatVL.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVL.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.compat; +package com.android.launcher3.uioverrides.dynamicui; import static android.app.WallpaperManager.FLAG_SYSTEM; @@ -58,7 +58,7 @@ public class WallpaperManagerCompatVL extends WallpaperManagerCompat { private static final String VERSION_PREFIX = "1,"; private static final String KEY_COLORS = "wallpaper_parsed_colors"; private static final String ACTION_EXTRACTION_COMPLETE = - "com.android.launcher3.compat.WallpaperManagerCompatVL.EXTRACTION_COMPLETE"; + "com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL.EXTRACTION_COMPLETE"; private final ArrayList mListeners = new ArrayList<>(); diff --git a/src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java similarity index 98% rename from src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java rename to src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java index 524f266fce..4509e05aa0 100644 --- a/src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/dynamicui/WallpaperManagerCompatVOMR1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.compat; +package com.android.launcher3.uioverrides.dynamicui; import android.annotation.TargetApi; import android.app.WallpaperColors; @@ -26,7 +26,6 @@ import android.util.Log; import java.lang.reflect.Method; - @TargetApi(27) public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat {