Removed wallpaper usage.
Wallpaper is an optional service; it was not really supported on auto, so it's now completely
disabled to improve multi-user switch time.
Test: manual verification
Bug: 138939803
Bug: 132111956
Change-Id: I7ac85984510c14987e06a3308ee0457c9a0be634
Merged-In: I7ac85984510c14987e06a3308ee0457c9a0be634
(cherry picked from commit 04fcb3cb8de4f44c743b1b4ddd5a1b053d9dffd4)
diff --git a/src/com/android/car/settings/FallbackHome.java b/src/com/android/car/settings/FallbackHome.java
index 41ef281..af54378 100644
--- a/src/com/android/car/settings/FallbackHome.java
+++ b/src/com/android/car/settings/FallbackHome.java
@@ -17,9 +17,6 @@
package com.android.car.settings;
import android.app.Activity;
-import android.app.WallpaperColors;
-import android.app.WallpaperManager;
-import android.app.WallpaperManager.OnColorsChangedListener;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -49,7 +46,6 @@
private static final int PROGRESS_TIMEOUT = 2000;
private boolean mProvisioned;
- private WallpaperManager mWallManager;
private final Runnable mProgressTimeoutRunnable = () -> {
View v = getLayoutInflater().inflate(
@@ -65,24 +61,11 @@
getWindow().addFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
};
- private final OnColorsChangedListener mColorsChangedListener = new OnColorsChangedListener() {
- @Override
- public void onColorsChanged(WallpaperColors colors, int which) {
- if (colors != null) {
- View decorView = getWindow().getDecorView();
- decorView.setSystemUiVisibility(
- updateVisibilityFlagsFromColors(colors, decorView.getSystemUiVisibility()));
- mWallManager.removeOnColorsChangedListener(this);
- }
- }
- };
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // Set ourselves totally black before the device is provisioned so that
- // we don't flash the wallpaper before SUW
+ // Set ourselves totally black before the device is provisioned
mProvisioned = Settings.Global.getInt(getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 0) != 0;
int flags;
@@ -95,19 +78,6 @@
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
}
- // Set the system ui flags to light status bar if the wallpaper supports dark text to match
- // current system ui color tints. Use a listener to wait for colors if not ready yet.
- mWallManager = getSystemService(WallpaperManager.class);
- if (mWallManager == null) {
- LOG.w("Wallpaper manager isn't ready, can't listen to color changes!");
- } else {
- WallpaperColors colors = mWallManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
- if (colors == null) {
- mWallManager.addOnColorsChangedListener(mColorsChangedListener, null /* handler */);
- } else {
- flags = updateVisibilityFlagsFromColors(colors, flags);
- }
- }
getWindow().getDecorView().setSystemUiVisibility(flags);
registerReceiver(mReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
@@ -131,9 +101,6 @@
protected void onDestroy() {
super.onDestroy();
unregisterReceiver(mReceiver);
- if (mWallManager != null) {
- mWallManager.removeOnColorsChangedListener(mColorsChangedListener);
- }
}
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -166,15 +133,6 @@
}
}
- private int updateVisibilityFlagsFromColors(WallpaperColors colors, int flags) {
- if ((colors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT) != 0) {
- return flags | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
- | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
- }
- return flags & ~(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR)
- & ~(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
- }
-
private Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
