Merge "APIs for developers to use DeviceDefault.DayNight." (f7ecba9f) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

core/res/res/values-night/themes_device_defaults.xml

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -65,4 +65,7 @@ easier.
	<style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.DeviceDefault.Dialog.Alert" />		<style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.DeviceDefault.Dialog.Alert" />

	<style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault" />		<style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault" />

			<style name="ThemeOverlay.DeviceDefault.Accent.DayNight"
			parent="@style/ThemeOverlay.DeviceDefault.Accent" />
	</resources>		</resources>
			No newline at end of file

core/res/res/values/public.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2951,6 +2951,8 @@
	<public-group type="style" first-id="0x010302e2">		<public-group type="style" first-id="0x010302e2">
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="Theme.DeviceDefault.DocumentsUI" />		<public name="Theme.DeviceDefault.DocumentsUI" />
			<public name="Theme.DeviceDefault.DayNight" />
			<public name="ThemeOverlay.DeviceDefault.Accent.DayNight" />
	</public-group>		</public-group>

	<public-group type="id" first-id="0x01020046">		<public-group type="id" first-id="0x01020046">

core/res/res/values/themes_device_defaults.xml

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1652,6 +1652,7 @@ easier.

	<style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="Theme.DeviceDefault.Light.Dialog.NoActionBar" />		<style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="Theme.DeviceDefault.Light.Dialog.NoActionBar" />

			<!-- DeviceDefault theme for day/night activities. -->
	<style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault.Light" />		<style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault.Light" />

	<!-- Theme used for the intent picker activity. -->		<!-- Theme used for the intent picker activity. -->
	@@ -1697,6 +1698,10 @@ easier.
	<item name="colorAccent">@color/accent_device_default_light</item>		<item name="colorAccent">@color/accent_device_default_light</item>
	</style>		</style>

			<!-- Theme overlay that replaces colorAccent with the colorAccent from {@link #Theme_DeviceDefault_DayNight}. -->
			<style name="ThemeOverlay.DeviceDefault.Accent.DayNight"
			parent="@style/ThemeOverlay.DeviceDefault.Accent.Light" />

	<style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="ThemeOverlay.Material.Dark.ActionBar">		<style name="ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent" parent="ThemeOverlay.Material.Dark.ActionBar">
	<item name="colorAccent">@color/accent_device_default_dark</item>		<item name="colorAccent">@color/accent_device_default_dark</item>
	</style>		</style>

Original line number	Original line	Diff line number	Diff line
	@@ -2222,6 +2222,7 @@ package android {
	field public static final int TextAppearance_WindowTitle = 16973907; // 0x1030053		field public static final int TextAppearance_WindowTitle = 16973907; // 0x1030053
	field public static final int Theme = 16973829; // 0x1030005		field public static final int Theme = 16973829; // 0x1030005
	field public static final int ThemeOverlay = 16974407; // 0x1030247		field public static final int ThemeOverlay = 16974407; // 0x1030247
			field public static final int ThemeOverlay_DeviceDefault_Accent_DayNight = 16974564; // 0x10302e4
	field public static final int ThemeOverlay_Material = 16974408; // 0x1030248		field public static final int ThemeOverlay_Material = 16974408; // 0x1030248
	field public static final int ThemeOverlay_Material_ActionBar = 16974409; // 0x1030249		field public static final int ThemeOverlay_Material_ActionBar = 16974409; // 0x1030249
	field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b		field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b
	@@ -2233,6 +2234,7 @@ package android {
	field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009		field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
	field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a		field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a
	field public static final int Theme_DeviceDefault = 16974120; // 0x1030128		field public static final int Theme_DeviceDefault = 16974120; // 0x1030128
			field public static final int Theme_DeviceDefault_DayNight = 16974563; // 0x10302e3
	field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e		field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e
	field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136		field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136
	field public static final int Theme_DeviceDefault_DialogWhenLarge_NoActionBar = 16974135; // 0x1030137		field public static final int Theme_DeviceDefault_DialogWhenLarge_NoActionBar = 16974135; // 0x1030137