From 5e7b238a93bddec69d27e1ed39a969c36f455f9f Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 25 Apr 2017 23:09:06 -0700 Subject: Updating color extraction to include wallpaper theme color. Also adding mathods and callbacks to pass the related data to the callbacks. Bug: 37616877 Change-Id: I7512cac7a603e8e5a05ec3a360c9eec493344b00 --- src/com/android/launcher3/Launcher.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/Launcher.java') diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a8d3d15d5..da52b4f3e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -466,6 +466,14 @@ public class Launcher extends BaseActivity @Override public void onExtractedColorsChanged() { loadExtractedColorsAndColorItems(); + + if (mLauncherCallbacks != null) { + mLauncherCallbacks.onExtractedColorsChanged(); + } + } + + public ExtractedColors getExtractedColors() { + return mExtractedColors; } @Override @@ -481,9 +489,9 @@ public class Launcher extends BaseActivity mExtractedColors.load(this); mHotseat.updateColor(mExtractedColors, !mPaused); mWorkspace.getPageIndicator().updateColor(mExtractedColors); - boolean lightStatusBar = (FeatureFlags.LIGHT_STATUS_BAR - && mExtractedColors.getColor(ExtractedColors.STATUS_BAR_INDEX, - ExtractedColors.DEFAULT_DARK) == ExtractedColors.DEFAULT_LIGHT); + boolean lightStatusBar = (FeatureFlags.LIGHT_STATUS_BAR && + mExtractedColors.getColor(ExtractedColors.STATUS_BAR_INDEX) == + ExtractedColors.DEFAULT_LIGHT); // It's possible that All Apps is visible when this is run, // so always use light status bar in that case. Only change nav bar color to status bar // color when All Apps is visible. -- cgit v1.2.3