Scrims should be grey when in-app
Bug: 38164389
Test: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
Change-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377
diff --git a/Android.mk b/Android.mk
index 00dc784..66c5987 100644
--- a/Android.mk
+++ b/Android.mk
@@ -357,6 +357,7 @@
core/java/android/view/IPinnedStackController.aidl \
core/java/android/view/IPinnedStackListener.aidl \
core/java/android/view/IRotationWatcher.aidl \
+ core/java/android/view/IWallpaperVisibilityListener.aidl \
core/java/android/view/IWindow.aidl \
core/java/android/view/IWindowFocusObserver.aidl \
core/java/android/view/IWindowId.aidl \
diff --git a/core/java/android/view/IWallpaperVisibilityListener.aidl b/core/java/android/view/IWallpaperVisibilityListener.aidl
new file mode 100644
index 0000000..349f984
--- /dev/null
+++ b/core/java/android/view/IWallpaperVisibilityListener.aidl
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 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 android.view;
+
+/**
+ * Listener to be invoked when wallpaper visibility changes.
+ * {@hide}
+ */
+oneway interface IWallpaperVisibilityListener {
+ /**
+ * Method that will be invoked when wallpaper becomes visible or hidden.
+ * @param visible True if wallpaper is being displayed; false otherwise.
+ * @param displayId The id of the display where wallpaper visibility changed.
+ */
+ void onWallpaperVisibilityChanged(boolean visible, int displayId);
+}
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 2b73c14..e576a0f 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -39,6 +39,7 @@
import android.view.IOnKeyguardExitResult;
import android.view.IPinnedStackListener;
import android.view.IRotationWatcher;
+import android.view.IWallpaperVisibilityListener;
import android.view.IWindowSession;
import android.view.IWindowSessionCallback;
import android.view.KeyEvent;
@@ -256,6 +257,19 @@
Bitmap screenshotWallpaper();
/**
+ * Registers a wallpaper visibility listener.
+ * @return Current visibility.
+ */
+ boolean registerWallpaperVisibilityListener(IWallpaperVisibilityListener listener,
+ int displayId);
+
+ /**
+ * Remove a visibility watcher that was added using registerWallpaperVisibilityListener.
+ */
+ void unregisterWallpaperVisibilityListener(IWallpaperVisibilityListener listener,
+ int displayId);
+
+ /**
* Used only for assist -- request a screenshot of the current application.
*/
boolean requestAssistScreenshot(IAssistScreenshotReceiver receiver);
diff --git a/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/ColorExtractor.java b/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/ColorExtractor.java
index 4a5d8b4..2d794fb 100644
--- a/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/ColorExtractor.java
+++ b/packages/SystemUI/colorextraction/src/com/google/android/colorextraction/ColorExtractor.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.VisibleForTesting;
+import android.support.v4.graphics.ColorUtils;
import android.util.Log;
import android.util.SparseArray;
@@ -41,15 +42,12 @@
private static final String TAG = "ColorExtractor";
- @VisibleForTesting
- static final int FALLBACK_COLOR = 0xff83888d;
+ public static final int FALLBACK_COLOR = 0xff83888d;
private int mMainFallbackColor = FALLBACK_COLOR;
private int mSecondaryFallbackColor = FALLBACK_COLOR;
private final SparseArray<GradientColors[]> mGradientColors;
private final ArrayList<OnColorsChangedListener> mOnColorsChangedListeners;
- // Colors to return when the wallpaper isn't visible
- private final GradientColors mWpHiddenColors;
private final Context mContext;
private final ExtractionType mExtractionType;
@@ -60,9 +58,6 @@
@VisibleForTesting
public ColorExtractor(Context context, ExtractionType extractionType) {
mContext = context;
- mWpHiddenColors = new GradientColors();
- mWpHiddenColors.setMainColor(FALLBACK_COLOR);
- mWpHiddenColors.setSecondaryColor(FALLBACK_COLOR);
mExtractionType = extractionType;
mGradientColors = new SparseArray<>();
@@ -123,7 +118,6 @@
if (which != WallpaperManager.FLAG_LOCK && which != WallpaperManager.FLAG_SYSTEM) {
throw new IllegalArgumentException("which should be FLAG_SYSTEM or FLAG_NORMAL");
}
-
return mGradientColors.get(which)[type];
}
@@ -134,7 +128,6 @@
GradientColors[] lockColors = mGradientColors.get(WallpaperManager.FLAG_LOCK);
extractInto(colors, lockColors[TYPE_NORMAL], lockColors[TYPE_DARK],
lockColors[TYPE_EXTRA_DARK]);
-
changed = true;
}
if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {
@@ -149,7 +142,7 @@
}
}
- private void triggerColorsChanged(int which) {
+ protected void triggerColorsChanged(int which) {
for (OnColorsChangedListener listener: mOnColorsChangedListeners) {
listener.onColorsChanged(this, which);
}
@@ -258,4 +251,4 @@
public interface OnColorsChangedListener {
void onColorsChanged(ColorExtractor colorExtractor, int which);
}
-}
+}
\ No newline at end of file
diff --git a/packages/SystemUI/colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java b/packages/SystemUI/colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
index fd698d0..b5f4a8c 100644
--- a/packages/SystemUI/colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
+++ b/packages/SystemUI/colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java
@@ -39,7 +39,7 @@
import org.junit.runner.RunWith;
/**
- * Tests tonal palette generation.
+ * Tests color extraction generation.
*/
@SmallTest
@RunWith(AndroidJUnit4.class)
@@ -101,14 +101,12 @@
};
ColorExtractor extractor = new ColorExtractor(mContext, type);
- assertEquals("Extracted colors not being used!",
- extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_NORMAL),
- colorsExpectedNormal);
- assertEquals("Extracted colors not being used!",
- extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_DARK),
- colorsExpectedDark);
- assertEquals("Extracted colors not being used!",
- extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_EXTRA_DARK),
- colorsExpectedExtraDark);
+ GradientColors colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM,
+ ColorExtractor.TYPE_NORMAL);
+ assertEquals("Extracted colors not being used!", colors, colorsExpectedNormal);
+ colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_DARK);
+ assertEquals("Extracted colors not being used!", colors, colorsExpectedDark);
+ colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_EXTRA_DARK);
+ assertEquals("Extracted colors not being used!", colors, colorsExpectedExtraDark);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 73a2a43..1b694b3 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -28,6 +28,7 @@
import com.android.internal.util.Preconditions;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.systemui.assist.AssistManager;
+import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.fragments.FragmentService;
import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.plugins.PluginDependencyProvider;
@@ -38,9 +39,9 @@
import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl;
import com.android.systemui.statusbar.phone.ManagedProfileController;
import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
-import com.android.systemui.statusbar.phone.StatusBarWindowManager;
import com.android.systemui.statusbar.phone.StatusBarIconController;
import com.android.systemui.statusbar.phone.StatusBarIconControllerImpl;
+import com.android.systemui.statusbar.phone.StatusBarWindowManager;
import com.android.systemui.statusbar.policy.AccessibilityController;
import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;
import com.android.systemui.statusbar.policy.BatteryController;
@@ -77,7 +78,6 @@
import com.android.systemui.statusbar.policy.UserSwitcherController;
import com.android.systemui.statusbar.policy.ZenModeController;
import com.android.systemui.statusbar.policy.ZenModeControllerImpl;
-import com.android.systemui.tuner.TunablePadding;
import com.android.systemui.tuner.TunablePadding.TunablePaddingService;
import com.android.systemui.tuner.TunerService;
import com.android.systemui.tuner.TunerServiceImpl;
@@ -86,8 +86,6 @@
import com.android.systemui.util.leak.LeakReporter;
import com.android.systemui.volume.VolumeDialogControllerImpl;
-import com.google.android.colorextraction.ColorExtractor;
-
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.HashMap;
@@ -109,6 +107,7 @@
* services, registered receivers, etc.
*/
public class Dependency extends SystemUI {
+ private static final String TAG = "Dependency";
/**
* Key for getting a background Looper for background work.
@@ -268,7 +267,7 @@
mProviders.put(AccessibilityManagerWrapper.class,
() -> new AccessibilityManagerWrapper(mContext));
- mProviders.put(ColorExtractor.class, () -> new ColorExtractor(mContext));
+ mProviders.put(SysuiColorExtractor.class, () -> new SysuiColorExtractor(mContext));
mProviders.put(TunablePaddingService.class, () -> new TunablePaddingService());
diff --git a/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java b/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java
new file mode 100644
index 0000000..5f393d0
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 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.systemui.colorextraction;
+
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.Display;
+import android.view.IWallpaperVisibilityListener;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import com.google.android.colorextraction.ColorExtractor;
+import com.google.android.colorextraction.types.ExtractionType;
+import com.google.android.colorextraction.types.Tonal;
+
+/**
+ * ColorExtractor aware of wallpaper visibility
+ */
+public class SysuiColorExtractor extends ColorExtractor {
+ private static final String TAG = "SysuiColorExtractor";
+ private boolean mWallpaperVisible;
+ // Colors to return when the wallpaper isn't visible
+ private final GradientColors mWpHiddenColors;
+
+ public SysuiColorExtractor(Context context) {
+ this(context, new Tonal(), true);
+ }
+
+ @VisibleForTesting
+ public SysuiColorExtractor(Context context, ExtractionType type, boolean registerVisibility) {
+ super(context, type);
+
+ mWpHiddenColors = new GradientColors();
+ mWpHiddenColors.setMainColor(FALLBACK_COLOR);
+ mWpHiddenColors.setSecondaryColor(FALLBACK_COLOR);
+
+ if (registerVisibility) {
+ try {
+ IWindowManager windowManagerService = WindowManagerGlobal.getWindowManagerService();
+ Handler handler = Handler.getMain();
+ boolean visible = windowManagerService.registerWallpaperVisibilityListener(
+ new IWallpaperVisibilityListener.Stub() {
+ @Override
+ public void onWallpaperVisibilityChanged(boolean newVisibility,
+ int displayId) throws RemoteException {
+ handler.post(() -> setWallpaperVisible(newVisibility));
+ }
+ }, Display.DEFAULT_DISPLAY);
+ setWallpaperVisible(visible);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Can't listen to wallpaper visibility changes", e);
+ }
+ }
+ }
+
+ /**
+ * Get TYPE_NORMAL colors when wallpaper is visible, or fallback otherwise.
+ *
+ * @param which FLAG_LOCK or FLAG_SYSTEM
+ * @return colors
+ */
+ @Override
+ public GradientColors getColors(int which) {
+ return getColors(which, TYPE_NORMAL);
+ }
+
+ /**
+ * Wallpaper colors when the wallpaper is visible, fallback otherwise.
+ *
+ * @param which FLAG_LOCK or FLAG_SYSTEM
+ * @param type TYPE_NORMAL, TYPE_DARK or TYPE_EXTRA_DARK
+ * @return colors
+ */
+ @Override
+ public GradientColors getColors(int which, int type) {
+ return getColors(which, type, false /* ignoreVisibility */);
+ }
+
+ /**
+ * Get TYPE_NORMAL colors, possibly ignoring wallpaper visibility.
+ *
+ * @param which FLAG_LOCK or FLAG_SYSTEM
+ * @param ignoreWallpaperVisibility whether you want fallback colors or not if the wallpaper
+ * isn't visible
+ * @return
+ */
+ public GradientColors getColors(int which, boolean ignoreWallpaperVisibility) {
+ return getColors(which, TYPE_NORMAL, ignoreWallpaperVisibility);
+ }
+
+ /**
+ *
+ * @param which FLAG_LOCK or FLAG_SYSTEM
+ * @param type TYPE_NORMAL, TYPE_DARK or TYPE_EXTRA_DARK
+ * @param ignoreWallpaperVisibility true if true wallpaper colors should be returning
+ * if it's visible or not
+ * @return colors
+ */
+ public GradientColors getColors(int which, int type, boolean ignoreWallpaperVisibility) {
+ if (mWallpaperVisible || ignoreWallpaperVisibility) {
+ return super.getColors(which, type);
+ } else {
+ return mWpHiddenColors;
+ }
+ }
+
+ @VisibleForTesting
+ void setWallpaperVisible(boolean visible) {
+ if (mWallpaperVisible != visible) {
+ mWallpaperVisible = visible;
+ triggerColorsChanged(WallpaperManager.FLAG_SYSTEM);
+ }
+ }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index e8dcf6c..80a6418 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -25,6 +25,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.systemui.Dependency;
import com.android.systemui.HardwareUiLayout;
+import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;
import com.android.systemui.statusbar.phone.ScrimController;
import com.android.systemui.volume.VolumeDialogImpl;
@@ -1227,7 +1228,7 @@
mClickListener = clickListener;
mLongClickListener = longClickListener;
mGradientDrawable = new GradientDrawable(mContext);
- mColorExtractor = Dependency.get(ColorExtractor.class);
+ mColorExtractor = Dependency.get(SysuiColorExtractor.class);
// Window initialization
Window window = getWindow();
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index 319b463..d710244 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -46,6 +46,7 @@
import com.android.systemui.Dependency;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
+import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.RecentsActivity;
import com.android.systemui.recents.RecentsActivityLaunchState;
@@ -113,7 +114,7 @@
private final float mScrimAlpha;
private GradientDrawable mBackgroundScrim;
- private final ColorExtractor mColorExtractor;
+ private final SysuiColorExtractor mColorExtractor;
private Animator mBackgroundScrimAnimator;
private RecentsTransitionHelper mTransitionHelper;
@@ -146,7 +147,7 @@
mBackgroundScrim = new GradientDrawable(context);
mBackgroundScrim.setCallback(this);
mBackgroundScrim.setAlpha((int) (mScrimAlpha * 255));
- mColorExtractor = Dependency.get(ColorExtractor.class);
+ mColorExtractor = Dependency.get(SysuiColorExtractor.class);
LayoutInflater inflater = LayoutInflater.from(context);
if (RecentsDebugFlags.Static.EnableStackActionButton) {
@@ -829,17 +830,23 @@
}
@Override
- public void onColorsChanged(ColorExtractor extractor, int which) {
+ public void onColorsChanged(ColorExtractor colorExtractor, int which) {
if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {
- mBackgroundScrim.setColors(extractor.getColors(WallpaperManager.FLAG_SYSTEM));
+ // Recents doesn't care about the wallpaper being visible or not, it always
+ // wants to scrim with wallpaper colors
+ mBackgroundScrim.setColors(
+ mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM, true));
}
}
public void onStart() {
mColorExtractor.addOnColorsChangedListener(this);
+ // Getting system scrim colors ignoring wallpaper visibility since it should never be grey.
+ ColorExtractor.GradientColors systemColors = mColorExtractor.getColors(
+ WallpaperManager.FLAG_SYSTEM, true);
// We don't want to interpolate colors because we're defining the initial state.
// Gradient should be set/ready when you open "Recents".
- mBackgroundScrim.setColors(mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM), false);
+ mBackgroundScrim.setColors(systemColors, false);
}
public void onStop() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index f502bb5..bc278e0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -36,6 +36,7 @@
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.systemui.Dependency;
import com.android.systemui.R;
+import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.statusbar.ExpandableNotificationRow;
import com.android.systemui.statusbar.NotificationData;
import com.android.systemui.statusbar.ScrimView;
@@ -78,7 +79,7 @@
private final View mHeadsUpScrim;
private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
- private final ColorExtractor mColorExtractor;
+ private final SysuiColorExtractor mColorExtractor;
private ColorExtractor.GradientColors mLockColors;
private ColorExtractor.GradientColors mLockColorsDark;
private ColorExtractor.GradientColors mSystemColors;
@@ -131,15 +132,17 @@
mLightBarController = lightBarController;
mScrimBehindAlpha = context.getResources().getFloat(R.dimen.scrim_behind_alpha);
- mColorExtractor = Dependency.get(ColorExtractor.class);
+ mColorExtractor = Dependency.get(SysuiColorExtractor.class);
mColorExtractor.addOnColorsChangedListener(this);
- mLockColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK);
- mSystemColors = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM);
+ mLockColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,
+ ColorExtractor.TYPE_NORMAL, true /* ignoreVisibility */);
+ mSystemColors = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,
+ ColorExtractor.TYPE_NORMAL, true /* ignoreVisibility */);
// Darker gradient for the top scrim (mScrimInFront)
mLockColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,
- ColorExtractor.TYPE_DARK);
+ ColorExtractor.TYPE_DARK, true /* ignoreVisibility */);
mSystemColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,
- ColorExtractor.TYPE_DARK);
+ ColorExtractor.TYPE_DARK, true /* ignoreVisibility */);
mNeedsDrawableColorUpdate = true;
updateHeadsUpScrim(false);
@@ -659,18 +662,18 @@
@Override
public void onColorsChanged(ColorExtractor colorExtractor, int which) {
if ((which & WallpaperManager.FLAG_LOCK) != 0) {
- mLockColors = colorExtractor.getColors(WallpaperManager.FLAG_LOCK,
- ColorExtractor.TYPE_NORMAL);
- mLockColorsDark = colorExtractor.getColors(WallpaperManager.FLAG_LOCK,
- ColorExtractor.TYPE_DARK);
+ mLockColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,
+ ColorExtractor.TYPE_NORMAL, true /* ignoreVisibility */);
+ mLockColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,
+ ColorExtractor.TYPE_DARK, true /* ignoreVisibility */);
mNeedsDrawableColorUpdate = true;
scheduleUpdate();
}
if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {
- mSystemColors = colorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,
- ColorExtractor.TYPE_NORMAL);
- mSystemColorsDark = colorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,
- ColorExtractor.TYPE_DARK);
+ mSystemColors = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,
+ ColorExtractor.TYPE_NORMAL, mKeyguardShowing);
+ mSystemColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,
+ ColorExtractor.TYPE_DARK, mKeyguardShowing);
mNeedsDrawableColorUpdate = true;
scheduleUpdate();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 0ac221f..2a30124 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -168,6 +168,7 @@
import com.android.systemui.assist.AssistManager;
import com.android.systemui.classifier.FalsingLog;
import com.android.systemui.classifier.FalsingManager;
+import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.doze.DozeHost;
import com.android.systemui.doze.DozeLog;
import com.android.systemui.fragments.ExtensionFragmentListener;
@@ -733,7 +734,7 @@
private HashMap<String, Entry> mPendingNotifications = new HashMap<>();
private boolean mClearAllEnabled;
@Nullable private View mAmbientIndicationContainer;
- private ColorExtractor mColorExtractor;
+ private SysuiColorExtractor mColorExtractor;
private ForegroundServiceController mForegroundServiceController;
private void recycleAllVisibilityObjects(ArraySet<NotificationVisibility> array) {
@@ -780,7 +781,7 @@
mOverlayManager = IOverlayManager.Stub.asInterface(
ServiceManager.getService(Context.OVERLAY_SERVICE));
- mColorExtractor = Dependency.get(ColorExtractor.class);
+ mColorExtractor = Dependency.get(SysuiColorExtractor.class);
mColorExtractor.addOnColorsChangedListener(this);
mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
@@ -4515,10 +4516,10 @@
// Ignore visibility since we calculate the theme based on the real colors,
// not the current state.
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
- useDarkTheme = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK)
+ useDarkTheme = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK, true /* vis */)
.supportsDarkText();
} else {
- useDarkTheme = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM)
+ useDarkTheme = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM, true /* vis */)
.supportsDarkText();
}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 1d3b533..6bf9224 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -80,6 +80,7 @@
import com.android.systemui.HardwareUiLayout;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
+import com.android.systemui.colorextraction.SysuiColorExtractor;
import com.android.systemui.plugins.VolumeDialogController;
import com.android.systemui.plugins.VolumeDialogController.State;
import com.android.systemui.plugins.VolumeDialogController.StreamState;
@@ -172,7 +173,7 @@
mInactiveSliderTint = loadColorStateList(R.color.volume_slider_inactive);
mGradientDrawable = new GradientDrawable(mContext);
mGradientDrawable.setAlpha((int) (ScrimController.GRADIENT_SCRIM_ALPHA * 255));
- mColorExtractor = Dependency.get(ColorExtractor.class);
+ mColorExtractor = Dependency.get(SysuiColorExtractor.class);
}
public void init(int windowType, Callback callback) {
@@ -231,10 +232,6 @@
mColorExtractor.addOnColorsChangedListener(this);
mGradientDrawable.setScreenSize(displaySize.x, displaySize.y);
- ColorExtractor.GradientColors colors = mColorExtractor.getColors(
- mKeyguard.isKeyguardLocked() ? WallpaperManager.FLAG_LOCK
- : WallpaperManager.FLAG_SYSTEM);
- mGradientDrawable.setColors(colors, false);
mDialogContentView = mDialog.findViewById(R.id.volume_dialog_content);
mDialogRowsView = mDialogContentView.findViewById(R.id.volume_dialog_rows);
@@ -490,6 +487,10 @@
rescheduleTimeoutH();
if (mShowing) return;
mShowing = true;
+ ColorExtractor.GradientColors colors = mColorExtractor.getColors(
+ mKeyguard.isKeyguardLocked() ? WallpaperManager.FLAG_LOCK
+ : WallpaperManager.FLAG_SYSTEM);
+ mGradientDrawable.setColors(colors, false);
mMotion.startShow();
Events.writeEvent(mContext, Events.EVENT_SHOW_DIALOG, reason, mKeyguard.isKeyguardLocked());
mController.notifyVisible(true);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java b/packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
new file mode 100644
index 0000000..177aa66
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2017 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.systemui.colorextraction;
+
+import static org.junit.Assert.assertEquals;
+
+import android.app.WallpaperManager;
+import android.graphics.Color;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.FlakyTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.systemui.SysuiTestCase;
+
+import com.google.android.colorextraction.ColorExtractor;
+import com.google.android.colorextraction.types.Tonal;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests color extraction generation.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SysuiColorExtractorTests extends SysuiTestCase {
+
+ private static int[] sWhich = new int[] {
+ WallpaperManager.FLAG_SYSTEM,
+ WallpaperManager.FLAG_LOCK};
+ private static int[] sTypes = new int[] {
+ ColorExtractor.TYPE_NORMAL,
+ ColorExtractor.TYPE_DARK,
+ ColorExtractor.TYPE_EXTRA_DARK};
+
+ @FlakyTest
+ @UiThreadTest
+ @Test
+ public void getColors_usesGreyIfWallpaperNotVisible() {
+ ColorExtractor.GradientColors fallbackColors = new ColorExtractor.GradientColors();
+ fallbackColors.setMainColor(ColorExtractor.FALLBACK_COLOR);
+ fallbackColors.setSecondaryColor(ColorExtractor.FALLBACK_COLOR);
+
+ SysuiColorExtractor extractor = new SysuiColorExtractor(getContext(), new Tonal(), false);
+ extractor.setWallpaperVisible(false);
+
+ for (int which : sWhich) {
+ for (int type : sTypes) {
+ assertEquals("Not using fallback!", extractor.getColors(which, type),
+ fallbackColors);
+ }
+ }
+ }
+
+ @FlakyTest
+ @UiThreadTest
+ @Test
+ public void getColors_doesntUseFallbackIfVisible() {
+ ColorExtractor.GradientColors colors = new ColorExtractor.GradientColors();
+ colors.setMainColor(Color.RED);
+ colors.setSecondaryColor(Color.RED);
+
+ SysuiColorExtractor extractor = new SysuiColorExtractor(getContext(),
+ (inWallpaperColors, outGradientColorsNormal, outGradientColorsDark,
+ outGradientColorsExtraDark) -> {
+ outGradientColorsNormal.set(colors);
+ outGradientColorsDark.set(colors);
+ outGradientColorsExtraDark.set(colors);
+ return true;
+ }, false);
+ extractor.setWallpaperVisible(true);
+
+ for (int which : sWhich) {
+ for (int type : sTypes) {
+ assertEquals("Not using extracted colors!",
+ extractor.getColors(which, type), colors);
+ }
+ }
+ }
+}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index ccc8f63..e840342 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -210,6 +210,7 @@
final DisplayMetrics mRealDisplayMetrics = new DisplayMetrics();
/** @see #computeCompatSmallestWidth(boolean, int, int, int, int) */
private final DisplayMetrics mTmpDisplayMetrics = new DisplayMetrics();
+
/**
* Compat metrics computed based on {@link #mDisplayMetrics}.
* @see #updateDisplayAndOrientation(int)
@@ -226,6 +227,7 @@
* @see #updateRotationUnchecked(boolean)
*/
private int mRotation = 0;
+
/**
* Last applied orientation of the display.
* Constants as per {@link android.content.pm.ActivityInfo.ScreenOrientation}.
@@ -233,6 +235,7 @@
* @see WindowManagerService#updateOrientationFromAppTokensLocked(boolean, int)
*/
private int mLastOrientation = SCREEN_ORIENTATION_UNSPECIFIED;
+
/**
* Flag indicating that the application is receiving an orientation that has different metrics
* than it expected. E.g. Portrait instead of Landscape.
@@ -240,6 +243,7 @@
* @see #updateRotationUnchecked(boolean)
*/
private boolean mAltOrientation = false;
+
/**
* Orientation forced by some window. If there is no visible window that specifies orientation
* it is set to {@link android.content.pm.ActivityInfo#SCREEN_ORIENTATION_UNSPECIFIED}.
@@ -247,6 +251,7 @@
* @see NonAppWindowContainers#getOrientation()
*/
private int mLastWindowForcedOrientation = SCREEN_ORIENTATION_UNSPECIFIED;
+
/**
* Last orientation forced by the keyguard. It is applied when keyguard is shown and is not
* occluded.
@@ -255,6 +260,11 @@
*/
private int mLastKeyguardForcedOrientation = SCREEN_ORIENTATION_UNSPECIFIED;
+ /**
+ * Keep track of wallpaper visibility to notify changes.
+ */
+ private boolean mLastWallpaperVisible = false;
+
private Rect mBaseDisplayRect = new Rect();
private Rect mContentRect = new Rect();
@@ -2754,6 +2764,12 @@
stopDimmingIfNeeded();
+ final boolean wallpaperVisible = mWallpaperController.isWallpaperVisible();
+ if (wallpaperVisible != mLastWallpaperVisible) {
+ mLastWallpaperVisible = wallpaperVisible;
+ mService.mWallpaperVisibilityListeners.notifyWallpaperVisibilityChanged(this);
+ }
+
while (!mTmpUpdateAllDrawn.isEmpty()) {
final AppWindowToken atoken = mTmpUpdateAllDrawn.removeLast();
// See if any windows have been drawn, so they (and others associated with them)
diff --git a/services/core/java/com/android/server/wm/WallpaperVisibilityListeners.java b/services/core/java/com/android/server/wm/WallpaperVisibilityListeners.java
new file mode 100644
index 0000000..2c06851
--- /dev/null
+++ b/services/core/java/com/android/server/wm/WallpaperVisibilityListeners.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2017 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.server.wm;
+
+import android.os.RemoteCallbackList;
+import android.os.RemoteException;
+import android.util.SparseArray;
+import android.view.IWallpaperVisibilityListener;
+
+/**
+ * Manages and trigger wallpaper visibility listeners.
+ */
+class WallpaperVisibilityListeners {
+
+ /**
+ * A map of displayIds and its listeners.
+ */
+ private final SparseArray<RemoteCallbackList<IWallpaperVisibilityListener>> mDisplayListeners =
+ new SparseArray<>();
+
+ void registerWallpaperVisibilityListener(IWallpaperVisibilityListener listener,
+ int displayId) {
+ RemoteCallbackList<IWallpaperVisibilityListener> listeners =
+ mDisplayListeners.get(displayId);
+ if (listeners == null) {
+ listeners = new RemoteCallbackList<>();
+ mDisplayListeners.append(displayId, listeners);
+ }
+ listeners.register(listener);
+ }
+
+ void unregisterWallpaperVisibilityListener(IWallpaperVisibilityListener listener,
+ int displayId) {
+ RemoteCallbackList<IWallpaperVisibilityListener> listeners =
+ mDisplayListeners.get(displayId);
+ if (listeners == null) {
+ return;
+ }
+ listeners.unregister(listener);
+ }
+
+ void notifyWallpaperVisibilityChanged(DisplayContent displayContent) {
+ final int displayId = displayContent.getDisplayId();
+ final boolean visible = displayContent.mWallpaperController.isWallpaperVisible();
+ RemoteCallbackList<IWallpaperVisibilityListener> displayListeners =
+ mDisplayListeners.get(displayId);
+
+ // No listeners for this display.
+ if (displayListeners == null) {
+ return;
+ }
+
+ int i = displayListeners.beginBroadcast();
+ while (i > 0) {
+ i--;
+ IWallpaperVisibilityListener listener = displayListeners.getBroadcastItem(i);
+ try {
+ listener.onWallpaperVisibilityChanged(visible, displayId);
+ } catch (RemoteException e) {
+ // Nothing to do in here, RemoteCallbackListener will clean it up.
+ }
+ }
+ displayListeners.finishBroadcast();
+ }
+}
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index f8ede6c..336a7f3 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -180,6 +180,7 @@
import android.view.IOnKeyguardExitResult;
import android.view.IPinnedStackListener;
import android.view.IRotationWatcher;
+import android.view.IWallpaperVisibilityListener;
import android.view.IWindow;
import android.view.IWindowId;
import android.view.IWindowManager;
@@ -547,9 +548,9 @@
}
class RotationWatcher {
- IRotationWatcher mWatcher;
- IBinder.DeathRecipient mDeathRecipient;
- int mDisplayId;
+ final IRotationWatcher mWatcher;
+ final IBinder.DeathRecipient mDeathRecipient;
+ final int mDisplayId;
RotationWatcher(IRotationWatcher watcher, IBinder.DeathRecipient deathRecipient,
int displayId) {
mWatcher = watcher;
@@ -560,6 +561,8 @@
ArrayList<RotationWatcher> mRotationWatchers = new ArrayList<>();
int mDeferredRotationPauseCount;
+ final WallpaperVisibilityListeners mWallpaperVisibilityListeners =
+ new WallpaperVisibilityListeners();
int mSystemDecorLayer = 0;
final Rect mScreenRect = new Rect();
@@ -3933,6 +3936,29 @@
}
}
+ @Override
+ public boolean registerWallpaperVisibilityListener(IWallpaperVisibilityListener listener,
+ int displayId) {
+ synchronized (mWindowMap) {
+ final DisplayContent displayContent = mRoot.getDisplayContentOrCreate(displayId);
+ if (displayContent == null) {
+ throw new IllegalArgumentException("Trying to register visibility event "
+ + "for invalid display: " + displayId);
+ }
+ mWallpaperVisibilityListeners.registerWallpaperVisibilityListener(listener, displayId);
+ return displayContent.mWallpaperController.isWallpaperVisible();
+ }
+ }
+
+ @Override
+ public void unregisterWallpaperVisibilityListener(IWallpaperVisibilityListener listener,
+ int displayId) {
+ synchronized (mWindowMap) {
+ mWallpaperVisibilityListeners
+ .unregisterWallpaperVisibilityListener(listener, displayId);
+ }
+ }
+
/**
* Apps that use the compact menu panel (as controlled by the panelMenuIsCompact
* theme attribute) on devices that feature a physical options menu key attempt to position