Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dark theme not turning on/off when in twilight mode" into rvc-dev am: 04041cf1d7 am: 0f4f05eb21 am: aa0527da8e am: d9b370d491

Browse Source 
Change-Id: I87d34f90cc6b5affc152171421fb8f6fd2450fee
This commit is contained in:
Jay Aliomer
2020-05-11 20:37:37 +00:00
committed by Automerger Merge Worker
parent de2167a0fe d9b370d491
commit 7c7cf378fd
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/UiModeManagerService.java
View File

@@ -165,9 +165,11 @@ final class UiModeManagerService extends SystemService {
} }
@VisibleForTesting @VisibleForTesting
protected UiModeManagerService(Context context, boolean setupWizardComplete) { protected UiModeManagerService(Context context, boolean setupWizardComplete,
TwilightManager tm) {
this(context); this(context);
mSetupWizardComplete = setupWizardComplete; mSetupWizardComplete = setupWizardComplete;
mTwilightManager = tm;
} }
private static Intent buildHomeIntent(String category) { private static Intent buildHomeIntent(String category) {
@@ -337,7 +339,6 @@ final class UiModeManagerService extends SystemService {
mAlarmManager = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE); mAlarmManager = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE);
mLocalPowerManager = mLocalPowerManager =
LocalServices.getService(PowerManagerInternal.class); LocalServices.getService(PowerManagerInternal.class);
mTwilightManager = getLocalService(TwilightManager.class);
initPowerSave(); initPowerSave();
mCarModeEnabled = mDockState == Intent.EXTRA_DOCK_STATE_CAR; mCarModeEnabled = mDockState == Intent.EXTRA_DOCK_STATE_CAR;
registerVrStateListener(); registerVrStateListener();
@@ -380,7 +381,7 @@ final class UiModeManagerService extends SystemService {
com.android.internal.R.bool.config_enableCarDockHomeLaunch); com.android.internal.R.bool.config_enableCarDockHomeLaunch);
mUiModeLocked = res.getBoolean(com.android.internal.R.bool.config_lockUiMode); mUiModeLocked = res.getBoolean(com.android.internal.R.bool.config_lockUiMode);
mNightModeLocked = res.getBoolean(com.android.internal.R.bool.config_lockDayNightMode); mNightModeLocked = res.getBoolean(com.android.internal.R.bool.config_lockDayNightMode);
mTwilightManager = getLocalService(TwilightManager.class);
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
mTelevision = pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION) mTelevision = pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)
|| pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK); || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK);

3
services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java
View File

@@ -147,7 +147,8 @@ public class UiModeManagerServiceTest extends UiServiceTestCase {
addLocalService(PowerManagerInternal.class, mLocalPowerManager); addLocalService(PowerManagerInternal.class, mLocalPowerManager);
addLocalService(TwilightManager.class, mTwilightManager); addLocalService(TwilightManager.class, mTwilightManager);
mUiManagerService = new UiModeManagerService(mContext, true); mUiManagerService = new UiModeManagerService(mContext, true,
mTwilightManager);
try { try {
mUiManagerService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY); mUiManagerService.onBootPhase(SystemService.PHASE_SYSTEM_SERVICES_READY);
} catch (SecurityException e) {/* ignore for permission denial */} } catch (SecurityException e) {/* ignore for permission denial */}