Merge "Correcting mNightMode which should set from Configuration" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
08361ad4e7
@@ -16,10 +16,8 @@
|
|||||||
|
|
||||||
package com.android.server.wm;
|
package com.android.server.wm;
|
||||||
|
|
||||||
import static android.app.UiModeManager.MODE_NIGHT_AUTO;
|
|
||||||
import static android.app.UiModeManager.MODE_NIGHT_CUSTOM;
|
|
||||||
|
|
||||||
import android.annotation.NonNull;
|
import android.annotation.NonNull;
|
||||||
|
import android.content.res.Configuration;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.LocaleList;
|
import android.os.LocaleList;
|
||||||
import android.util.AtomicFile;
|
import android.util.AtomicFile;
|
||||||
@@ -303,7 +301,7 @@ public class PackageConfigPersister {
|
|||||||
}
|
}
|
||||||
|
|
||||||
boolean isResetNightMode() {
|
boolean isResetNightMode() {
|
||||||
return mNightMode == MODE_NIGHT_AUTO || mNightMode == MODE_NIGHT_CUSTOM;
|
return mNightMode == Configuration.UI_MODE_NIGHT_UNDEFINED;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user