From 40ec6b7814d47532360305ba8a83d3cdaa0b724a Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 5 Jun 2018 19:07:16 -0700 Subject: [PATCH] Migrate SysUI theme to UiMode Legacy RRO was deleted and resources migrated to DeviceDefault theme. Theming via overlays is still possible, but the overlay should provide both themes: day and night. Test: adb shell service call uimode 4 i32 1 Test: adb shell service call uimode 4 i32 2 Change-Id: I5dee2f94764c5c2f4e11cfabfff97656b3822e8a --- core/res/res/values-night/values.xml | 34 ++++++++++++ .../color-night}/qs_detail_progress_track.xml | 0 packages/SystemUI/res/values/styles.xml | 7 +-- .../systemui/AutoReinflateContainer.java | 5 ++ .../fragments/FragmentHostManager.java | 3 +- .../globalactions/GlobalActionsDialog.java | 6 +- .../phone/ConfigurationControllerImpl.java | 13 ++++- .../systemui/statusbar/phone/StatusBar.java | 55 +++++++------------ .../policy/BrightnessMirrorController.java | 9 +-- .../policy/ConfigurationController.java | 1 + .../volume/VolumeDialogComponent.java | 2 +- .../overlays/SysuiDarkThemeOverlay/Android.mk | 14 ----- .../SysuiDarkThemeOverlay/AndroidManifest.xml | 8 --- .../res/values-af/strings.xml | 23 -------- .../res/values-am/strings.xml | 23 -------- .../res/values-ar/strings.xml | 23 -------- .../res/values-as/strings.xml | 23 -------- .../res/values-az/strings.xml | 23 -------- .../res/values-b+sr+Latn/strings.xml | 23 -------- .../res/values-be/strings.xml | 23 -------- .../res/values-bg/strings.xml | 23 -------- .../res/values-bn/strings.xml | 23 -------- .../res/values-bs/strings.xml | 23 -------- .../res/values-ca/strings.xml | 23 -------- .../res/values-cs/strings.xml | 23 -------- .../res/values-da/strings.xml | 23 -------- .../res/values-de/strings.xml | 23 -------- .../res/values-el/strings.xml | 23 -------- .../res/values-en-rAU/strings.xml | 23 -------- .../res/values-en-rCA/strings.xml | 23 -------- .../res/values-en-rGB/strings.xml | 23 -------- .../res/values-en-rIN/strings.xml | 23 -------- .../res/values-en-rXC/strings.xml | 23 -------- .../res/values-es-rUS/strings.xml | 23 -------- .../res/values-es/strings.xml | 23 -------- .../res/values-et/strings.xml | 23 -------- .../res/values-eu/strings.xml | 23 -------- .../res/values-fa/strings.xml | 23 -------- .../res/values-fi/strings.xml | 23 -------- .../res/values-fr-rCA/strings.xml | 23 -------- .../res/values-fr/strings.xml | 23 -------- .../res/values-gl/strings.xml | 23 -------- .../res/values-gu/strings.xml | 23 -------- .../res/values-hi/strings.xml | 23 -------- .../res/values-hr/strings.xml | 23 -------- .../res/values-hu/strings.xml | 23 -------- .../res/values-hy/strings.xml | 23 -------- .../res/values-in/strings.xml | 23 -------- .../res/values-is/strings.xml | 23 -------- .../res/values-it/strings.xml | 23 -------- .../res/values-iw/strings.xml | 23 -------- .../res/values-ja/strings.xml | 23 -------- .../res/values-ka/strings.xml | 23 -------- .../res/values-kk/strings.xml | 23 -------- .../res/values-km/strings.xml | 23 -------- .../res/values-kn/strings.xml | 23 -------- .../res/values-ko/strings.xml | 23 -------- .../res/values-ky/strings.xml | 23 -------- .../res/values-lo/strings.xml | 23 -------- .../res/values-lt/strings.xml | 23 -------- .../res/values-lv/strings.xml | 23 -------- .../res/values-mk/strings.xml | 23 -------- .../res/values-ml/strings.xml | 23 -------- .../res/values-mn/strings.xml | 23 -------- .../res/values-mr/strings.xml | 23 -------- .../res/values-ms/strings.xml | 23 -------- .../res/values-my/strings.xml | 23 -------- .../res/values-nb/strings.xml | 23 -------- .../res/values-ne/strings.xml | 23 -------- .../res/values-nl/strings.xml | 23 -------- .../res/values-or/strings.xml | 23 -------- .../res/values-pa/strings.xml | 23 -------- .../res/values-pl/strings.xml | 23 -------- .../res/values-pt-rBR/strings.xml | 23 -------- .../res/values-pt-rPT/strings.xml | 23 -------- .../res/values-pt/strings.xml | 23 -------- .../res/values-ro/strings.xml | 23 -------- .../res/values-ru/strings.xml | 23 -------- .../res/values-si/strings.xml | 23 -------- .../res/values-sk/strings.xml | 23 -------- .../res/values-sl/strings.xml | 23 -------- .../res/values-sq/strings.xml | 23 -------- .../res/values-sr/strings.xml | 23 -------- .../res/values-sv/strings.xml | 23 -------- .../res/values-sw/strings.xml | 23 -------- .../res/values-ta/strings.xml | 23 -------- .../res/values-te/strings.xml | 23 -------- .../res/values-th/strings.xml | 23 -------- .../res/values-tl/strings.xml | 23 -------- .../res/values-tr/strings.xml | 23 -------- .../res/values-uk/strings.xml | 23 -------- .../res/values-ur/strings.xml | 23 -------- .../res/values-uz/strings.xml | 23 -------- .../res/values-vi/strings.xml | 23 -------- .../res/values-zh-rCN/strings.xml | 23 -------- .../res/values-zh-rHK/strings.xml | 23 -------- .../res/values-zh-rTW/strings.xml | 23 -------- .../res/values-zu/strings.xml | 23 -------- .../res/values/strings.xml | 24 -------- .../res/values/styles.xml | 12 ---- 100 files changed, 83 insertions(+), 2065 deletions(-) create mode 100644 core/res/res/values-night/values.xml rename packages/{overlays/SysuiDarkThemeOverlay/res/color => SystemUI/res/color-night}/qs_detail_progress_track.xml (100%) delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/Android.mk delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/AndroidManifest.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-af/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-am/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ar/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-as/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-az/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-b+sr+Latn/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-be/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-bg/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-bn/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-bs/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ca/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-cs/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-da/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-de/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-el/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-en-rAU/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-en-rCA/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-en-rGB/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-en-rIN/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-en-rXC/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-es-rUS/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-es/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-et/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-eu/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-fa/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-fi/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-fr-rCA/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-fr/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-gl/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-gu/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-hi/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-hr/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-hu/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-hy/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-in/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-is/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-it/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-iw/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ja/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ka/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-kk/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-km/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-kn/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ko/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ky/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-lo/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-lt/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-lv/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-mk/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ml/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-mn/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-mr/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ms/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-my/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-nb/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ne/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-nl/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-or/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-pa/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-pl/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rBR/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rPT/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-pt/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ro/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ru/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-si/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-sk/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-sl/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-sq/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-sr/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-sv/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-sw/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ta/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-te/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-th/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-tl/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-tr/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-uk/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-ur/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-uz/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-vi/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rCN/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rHK/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rTW/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values-zu/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values/strings.xml delete mode 100644 packages/overlays/SysuiDarkThemeOverlay/res/values/styles.xml diff --git a/core/res/res/values-night/values.xml b/core/res/res/values-night/values.xml new file mode 100644 index 0000000000000..23b0a24fff98b --- /dev/null +++ b/core/res/res/values-night/values.xml @@ -0,0 +1,34 @@ + + + + + + \ No newline at end of file diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/color/qs_detail_progress_track.xml b/packages/SystemUI/res/color-night/qs_detail_progress_track.xml similarity index 100% rename from packages/overlays/SysuiDarkThemeOverlay/res/color/qs_detail_progress_track.xml rename to packages/SystemUI/res/color-night/qs_detail_progress_track.xml diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 988a516653163..f8670485caf78 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -335,10 +335,7 @@ ?android:attr/colorError - - - diff --git a/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java b/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java index 01b42545a8cfe..bbc8ecdcc0664 100644 --- a/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java +++ b/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java @@ -91,6 +91,11 @@ public class AutoReinflateContainer extends FrameLayout implements inflateLayout(); } + @Override + public void onUiModeChanged() { + inflateLayout(); + } + @Override public void onLocaleListChanged() { inflateLayout(); diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java index f422737bb9af3..0ed1cd128caa9 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java @@ -51,7 +51,8 @@ public class FragmentHostManager { private final View mRootView; private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges( ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE - | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS); + | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS + | ActivityInfo.CONFIG_UI_MODE); private final FragmentService mManager; private final ExtensionFragmentManager mPlugins = new ExtensionFragmentManager(); diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 532fa034a03b5..201f40e40f26c 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -265,7 +265,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, if (!mHasVibrator) { mSilentModeAction = new SilentModeToggleAction(); } else { - mSilentModeAction = new SilentModeTriStateAction(mContext, mAudioManager, mHandler); + mSilentModeAction = new SilentModeTriStateAction(mAudioManager, mHandler); } mAirplaneModeOn = new ToggleAction( R.drawable.ic_lock_airplane_mode, @@ -1211,12 +1211,10 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, private final AudioManager mAudioManager; private final Handler mHandler; - private final Context mContext; - SilentModeTriStateAction(Context context, AudioManager audioManager, Handler handler) { + SilentModeTriStateAction(AudioManager audioManager, Handler handler) { mAudioManager = audioManager; mHandler = handler; - mContext = context; } private int ringerModeToIndex(int ringerMode) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java index 6f538440647e8..7ddca1756070b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java @@ -64,8 +64,9 @@ public class ConfigurationControllerImpl implements ConfigurationController, final float fontScale = newConfig.fontScale; final int density = newConfig.densityDpi; int uiMode = newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK; + boolean uiModeChanged = uiMode != mUiMode; if (density != mDensity || fontScale != mFontScale - || (mInCarMode && uiMode != mUiMode)) { + || (mInCarMode && uiModeChanged)) { listeners.forEach(l -> { if (mListeners.contains(l)) { l.onDensityOrFontScaleChanged(); @@ -73,7 +74,6 @@ public class ConfigurationControllerImpl implements ConfigurationController, }); mDensity = density; mFontScale = fontScale; - mUiMode = uiMode; } final LocaleList localeList = newConfig.getLocales(); @@ -86,6 +86,15 @@ public class ConfigurationControllerImpl implements ConfigurationController, }); } + if (uiModeChanged) { + mUiMode = uiMode; + listeners.forEach(l -> { + if (mListeners.contains(l)) { + l.onUiModeChanged(); + } + }); + } + if ((mLastConfig.updateFrom(newConfig) & ActivityInfo.CONFIG_ASSETS_PATHS) != 0) { listeners.forEach(l -> { if (mListeners.contains(l)) { 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 cf365bfb25194..7cf2c3376e894 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -55,6 +55,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.app.StatusBarManager; import android.app.TaskStackBuilder; +import android.app.UiModeManager; import android.app.WallpaperColors; import android.app.WallpaperInfo; import android.app.WallpaperManager; @@ -573,7 +574,7 @@ public class StatusBar extends SystemUI implements DemoMode, = (KeyguardMonitorImpl) Dependency.get(KeyguardMonitor.class); private BatteryController mBatteryController; protected boolean mPanelExpanded; - private IOverlayManager mOverlayManager; + private UiModeManager mUiModeManager; private boolean mKeyguardRequested; private boolean mIsKeyguard; private LogMaker mStatusBarStateLog; @@ -634,8 +635,7 @@ public class StatusBar extends SystemUI implements DemoMode, mWakefulnessLifecycle.addObserver(mWakefulnessObserver); mBatteryController = Dependency.get(BatteryController.class); mAssistManager = Dependency.get(AssistManager.class); - mOverlayManager = IOverlayManager.Stub.asInterface( - ServiceManager.getService(Context.OVERLAY_SERVICE)); + mUiModeManager = mContext.getSystemService(UiModeManager.class); mLockscreenUserManager = Dependency.get(NotificationLockscreenUserManager.class); mGutsManager = Dependency.get(NotificationGutsManager.class); mMediaManager = Dependency.get(NotificationMediaManager.class); @@ -1188,6 +1188,18 @@ public class StatusBar extends SystemUI implements DemoMode, } } + @Override + public void onUiModeChanged() { + // UiMode will change the style was already evaluated. + // We need to force the re-evaluation to make sure that all parents + // are up to date and new attrs will be rettrieved. + mContext.getTheme().applyStyle(mContext.getThemeResId(), true); + + if (mBrightnessMirrorController != null) { + mBrightnessMirrorController.onUiModeChanged(); + } + } + private void inflateEmptyShadeView() { if (mStackScroller == null) { return; @@ -2088,17 +2100,6 @@ public class StatusBar extends SystemUI implements DemoMode, updateTheme(); } - public boolean isUsingDarkTheme() { - OverlayInfo themeInfo = null; - try { - themeInfo = mOverlayManager.getOverlayInfo("com.android.systemui.theme.dark", - mLockscreenUserManager.getCurrentUserId()); - } catch (RemoteException e) { - e.printStackTrace(); - } - return themeInfo != null && themeInfo.isEnabled(); - } - @Nullable public View getAmbientIndicationContainer() { return mAmbientIndicationContainer; @@ -2801,11 +2802,11 @@ public class StatusBar extends SystemUI implements DemoMode, mStackScroller.dump(fd, pw, args); } pw.println(" Theme:"); - if (mOverlayManager == null) { - pw.println(" overlay manager not initialized!"); - } else { - pw.println(" dark overlay on: " + isUsingDarkTheme()); - } + String nightMode = mUiModeManager == null ? "null" : mUiModeManager.getNightMode() + ""; + pw.println(" dark theme: " + nightMode + + " (auto: " + UiModeManager.MODE_NIGHT_AUTO + + ", yes: " + UiModeManager.MODE_NIGHT_YES + + ", no: " + UiModeManager.MODE_NIGHT_NO + ")"); final boolean lightWpTheme = mContext.getThemeResId() == R.style.Theme_SystemUI_Light; pw.println(" light wallpaper theme: " + lightWpTheme); @@ -3875,22 +3876,6 @@ public class StatusBar extends SystemUI implements DemoMode, protected void updateTheme() { final boolean inflated = mStackScroller != null && mStatusBarWindowManager != null; - // The system wallpaper defines if QS should be light or dark. - WallpaperColors systemColors = mColorExtractor - .getWallpaperColors(WallpaperManager.FLAG_SYSTEM); - final boolean useDarkTheme = systemColors != null - && (systemColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_THEME) != 0; - if (isUsingDarkTheme() != useDarkTheme) { - mUiOffloadThread.submit(() -> { - try { - mOverlayManager.setEnabled("com.android.systemui.theme.dark", - useDarkTheme, mLockscreenUserManager.getCurrentUserId()); - } catch (RemoteException e) { - Log.w(TAG, "Can't change theme", e); - } - }); - } - // Lock wallpaper defines the color of the majority of the views, hence we'll use it // to set our default theme. final boolean lockDarkText = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK, true diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java index e9bdc6848ab00..b1986782e914e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.policy; import android.annotation.NonNull; import android.content.res.Resources; import android.util.ArraySet; -import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; @@ -105,11 +104,9 @@ public class BrightnessMirrorController } private void reinflate() { - ContextThemeWrapper qsThemeContext = - new ContextThemeWrapper(mBrightnessMirror.getContext(), R.style.qs_theme); int index = mStatusBarWindow.indexOfChild(mBrightnessMirror); mStatusBarWindow.removeView(mBrightnessMirror); - mBrightnessMirror = LayoutInflater.from(qsThemeContext).inflate( + mBrightnessMirror = LayoutInflater.from(mBrightnessMirror.getContext()).inflate( R.layout.brightness_mirror, mStatusBarWindow, false); mStatusBarWindow.addView(mBrightnessMirror, index); @@ -129,6 +126,10 @@ public class BrightnessMirrorController mBrightnessMirrorListeners.remove(listener); } + public void onUiModeChanged() { + reinflate(); + } + public interface BrightnessMirrorListener { void onBrightnessMirrorReinflated(View brightnessMirror); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java index 3dca371541eff..8c631d9107df3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java @@ -28,6 +28,7 @@ public interface ConfigurationController extends CallbackController - - - - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-af/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-af/strings.xml deleted file mode 100644 index 33c6982e007ab..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-af/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Donker" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-am/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-am/strings.xml deleted file mode 100644 index 59795695251be..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-am/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ጨለማ" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ar/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ar/strings.xml deleted file mode 100644 index 7b20c01957aa2..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ar/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "داكن" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-as/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-as/strings.xml deleted file mode 100644 index 0910e7e753cb8..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-as/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "গাঢ়" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-az/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-az/strings.xml deleted file mode 100644 index a9db75cdb5255..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-az/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Qaranlıq" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-b+sr+Latn/strings.xml deleted file mode 100644 index b63dcbcaa88e7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-b+sr+Latn/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tamno" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-be/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-be/strings.xml deleted file mode 100644 index eb875b3e80359..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-be/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Цёмная" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-bg/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-bg/strings.xml deleted file mode 100644 index 7b39462ffc25c..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-bg/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Тъмно" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-bn/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-bn/strings.xml deleted file mode 100644 index 0910e7e753cb8..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-bn/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "গাঢ়" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-bs/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-bs/strings.xml deleted file mode 100644 index b63dcbcaa88e7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-bs/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tamno" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ca/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ca/strings.xml deleted file mode 100644 index 02ee2268bb831..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ca/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Fosc" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-cs/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-cs/strings.xml deleted file mode 100644 index 5d11f07d99488..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-cs/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tmavé" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-da/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-da/strings.xml deleted file mode 100644 index 460ebe7739bc0..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-da/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Mørk" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-de/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-de/strings.xml deleted file mode 100644 index 4b54b8e119208..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-de/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Dunkel" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-el/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-el/strings.xml deleted file mode 100644 index c58061dab3379..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-el/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Σκοτεινό" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rAU/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rAU/strings.xml deleted file mode 100644 index 7c94a51ded3c0..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rAU/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Dark" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rCA/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rCA/strings.xml deleted file mode 100644 index 7c94a51ded3c0..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rCA/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Dark" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rGB/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rGB/strings.xml deleted file mode 100644 index 7c94a51ded3c0..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rGB/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Dark" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rIN/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rIN/strings.xml deleted file mode 100644 index 7c94a51ded3c0..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rIN/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Dark" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rXC/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rXC/strings.xml deleted file mode 100644 index cbdd3d2030b4a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-en-rXC/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎Dark‎‏‎‎‏‎" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-es-rUS/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-es-rUS/strings.xml deleted file mode 100644 index 2717f0f879c5a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Oscuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-es/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-es/strings.xml deleted file mode 100644 index 2717f0f879c5a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-es/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Oscuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-et/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-et/strings.xml deleted file mode 100644 index e0cce054fc073..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-et/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tume" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-eu/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-eu/strings.xml deleted file mode 100644 index 44cee4cf9da49..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-eu/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Iluna" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-fa/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-fa/strings.xml deleted file mode 100644 index fdd1df54bfff4..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-fa/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "تیره" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-fi/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-fi/strings.xml deleted file mode 100644 index 237fe70ff91d6..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-fi/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tumma" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-fr-rCA/strings.xml deleted file mode 100644 index f92c2ef95af37..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-fr-rCA/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Sombre" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-fr/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-fr/strings.xml deleted file mode 100644 index eac51d3a4fbfe..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-fr/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Foncé" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-gl/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-gl/strings.xml deleted file mode 100644 index 300868f871e2e..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-gl/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Escuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-gu/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-gu/strings.xml deleted file mode 100644 index 6a4cd62ff26f2..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-gu/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ઘેરી" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-hi/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-hi/strings.xml deleted file mode 100644 index c5bc0e24ed5c9..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-hi/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "गहरे रंग की थीम" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-hr/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-hr/strings.xml deleted file mode 100644 index b63dcbcaa88e7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-hr/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tamno" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-hu/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-hu/strings.xml deleted file mode 100644 index 84a3ab87c7210..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-hu/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Sötét" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-hy/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-hy/strings.xml deleted file mode 100644 index 555cb647083ea..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-hy/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Մուգ" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-in/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-in/strings.xml deleted file mode 100644 index 391451bc3afe5..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-in/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Gelap" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-is/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-is/strings.xml deleted file mode 100644 index f4d15311c951e..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-is/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Dökkt" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-it/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-it/strings.xml deleted file mode 100644 index b59155bda97aa..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-it/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Scuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-iw/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-iw/strings.xml deleted file mode 100644 index 3ecf444fcbb0b..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-iw/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "כהה" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ja/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ja/strings.xml deleted file mode 100644 index 3a2dba02f5019..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ja/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ダーク" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ka/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ka/strings.xml deleted file mode 100644 index 36bf77e1c8a4a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ka/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "მუქი" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-kk/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-kk/strings.xml deleted file mode 100644 index 913c0b18448d6..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-kk/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Қараңғы" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-km/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-km/strings.xml deleted file mode 100644 index b56c4909fbc7a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-km/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ងងឹត" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-kn/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-kn/strings.xml deleted file mode 100644 index e757116683874..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-kn/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ಕತ್ತಲೆ" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ko/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ko/strings.xml deleted file mode 100644 index ca4ab1e283aef..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ko/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "어두움" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ky/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ky/strings.xml deleted file mode 100644 index e8e827972a04e..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ky/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Караңгы" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-lo/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-lo/strings.xml deleted file mode 100644 index 0434a413fb7fc..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-lo/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ມືດ" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-lt/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-lt/strings.xml deleted file mode 100644 index 147779b850f4f..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-lt/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tamsi" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-lv/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-lv/strings.xml deleted file mode 100644 index 7a296ecda7f39..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-lv/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tumšs" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-mk/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-mk/strings.xml deleted file mode 100644 index 6be693af12196..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-mk/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Темна" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ml/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ml/strings.xml deleted file mode 100644 index f8a24fa4af665..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ml/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ഡാർക്ക്" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-mn/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-mn/strings.xml deleted file mode 100644 index e65d9c70c07df..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-mn/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Бараан" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-mr/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-mr/strings.xml deleted file mode 100644 index 854af000ab0f7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-mr/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "गडद" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ms/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ms/strings.xml deleted file mode 100644 index 391451bc3afe5..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ms/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Gelap" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-my/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-my/strings.xml deleted file mode 100644 index 008e9c694a98f..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-my/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "မှောင်သော" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-nb/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-nb/strings.xml deleted file mode 100644 index 460ebe7739bc0..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-nb/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Mørk" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ne/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ne/strings.xml deleted file mode 100644 index 8f2c5ba897326..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ne/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "अँध्यारो" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-nl/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-nl/strings.xml deleted file mode 100644 index 33c6982e007ab..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-nl/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Donker" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-or/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-or/strings.xml deleted file mode 100644 index d8045bd6de6ec..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-or/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ଗାଢ଼" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-pa/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-pa/strings.xml deleted file mode 100644 index 71103030493a4..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-pa/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ਗੂੜ੍ਹਾ" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-pl/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-pl/strings.xml deleted file mode 100644 index 25ca20fe421d7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-pl/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Ciemna" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rBR/strings.xml deleted file mode 100644 index 300868f871e2e..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Escuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rPT/strings.xml deleted file mode 100644 index 300868f871e2e..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Escuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-pt/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-pt/strings.xml deleted file mode 100644 index 300868f871e2e..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-pt/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Escuro" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ro/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ro/strings.xml deleted file mode 100644 index de73f36e6b833..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ro/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Întunecată" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ru/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ru/strings.xml deleted file mode 100644 index b05e84454c68b..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ru/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Темный" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-si/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-si/strings.xml deleted file mode 100644 index f0f572502f5f7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-si/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "අඳුරු" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-sk/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-sk/strings.xml deleted file mode 100644 index 5df68959b1a25..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-sk/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tmavý" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-sl/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-sl/strings.xml deleted file mode 100644 index ad58250a117c7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-sl/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Temno" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-sq/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-sq/strings.xml deleted file mode 100644 index 0e1eae7064b64..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-sq/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "E errët" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-sr/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-sr/strings.xml deleted file mode 100644 index 1561ee298a2c7..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-sr/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Тамно" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-sv/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-sv/strings.xml deleted file mode 100644 index 676de42dceb1f..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-sv/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Mörk" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-sw/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-sw/strings.xml deleted file mode 100644 index cc1f120adfc17..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-sw/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Nyeusi" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ta/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ta/strings.xml deleted file mode 100644 index af98172472d4f..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ta/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "டார்க்" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-te/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-te/strings.xml deleted file mode 100644 index 446455fe7dd88..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-te/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ముదురు రంగు" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-th/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-th/strings.xml deleted file mode 100644 index 9e3462b61e4bf..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-th/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "เข้ม" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-tl/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-tl/strings.xml deleted file mode 100644 index 5502d90a889cc..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-tl/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Madilim" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-tr/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-tr/strings.xml deleted file mode 100644 index 368b398bcf173..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-tr/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Koyu" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-uk/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-uk/strings.xml deleted file mode 100644 index 6e67e455e95dc..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-uk/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Темна тема" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-ur/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-ur/strings.xml deleted file mode 100644 index 1d5d6de407b3d..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-ur/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "گہرا" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-uz/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-uz/strings.xml deleted file mode 100644 index 957c28f8fb040..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-uz/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tungi" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-vi/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-vi/strings.xml deleted file mode 100644 index a45888955988a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-vi/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Tối" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rCN/strings.xml deleted file mode 100644 index c9b43dcba4ea6..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "深色" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rHK/strings.xml deleted file mode 100644 index c9b43dcba4ea6..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rHK/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "深色" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rTW/strings.xml deleted file mode 100644 index c9b43dcba4ea6..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "深色" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values-zu/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values-zu/strings.xml deleted file mode 100644 index 6d328da358a7b..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values-zu/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "Emnyama" - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values/strings.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values/strings.xml deleted file mode 100644 index 71f48d6279f19..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values/strings.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Dark - - - diff --git a/packages/overlays/SysuiDarkThemeOverlay/res/values/styles.xml b/packages/overlays/SysuiDarkThemeOverlay/res/values/styles.xml deleted file mode 100644 index 41a294092648a..0000000000000 --- a/packages/overlays/SysuiDarkThemeOverlay/res/values/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file