Merge "Dark theme helper" (03906f0e) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -12575,6 +12575,7 @@ package android.content.res {
		method public int getLayoutDirection();
		method @NonNull public android.os.LocaleList getLocales();
		method public boolean isLayoutSizeAtLeast(int);
		method public boolean isNightModeActive();
		method public boolean isScreenHdr();
		method public boolean isScreenRound();
		method public boolean isScreenWideColorGamut();

+10 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.TestApi;
		import android.app.UiModeManager;
		import android.app.WindowConfiguration;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.LocaleProto;
		@@ -1975,6 +1976,15 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		readFromParcel(source);
		}


		/**
		* Retuns whether the configuration is in night mode
		* @return true if night mode is active and false otherwise
		*/
		public boolean isNightModeActive() {
		return (uiMode & UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES;
		}

		public int compareTo(Configuration that) {
		int n;
		float a = this.fontScale;

+9 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,15 @@ public class ConfigurationTest extends TestCase {
		assertEquals(SMALLEST_SCREEN_WIDTH_DP_UNDEFINED, config.smallestScreenWidthDp);
		}

		@Test
		public void testNightModeHelper() {
		Configuration config = new Configuration();
		config.uiMode = Configuration.UI_MODE_NIGHT_YES;
		assertTrue(config.isNightModeActive());
		config.uiMode = Configuration.UI_MODE_NIGHT_NO;
		assertFalse(config.isNightModeActive());
		}

		private void dumpDebug(File f, Configuration config) throws Exception {
		final AtomicFile af = new AtomicFile(f);
		FileOutputStream fos = af.startWrite();