Merge "PrintSpooler edge to edge support" into main (9bc13cfc) · Commits · e / os / android_frameworks_base

packages/PrintSpooler/Android.bp

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -47,20 +47,23 @@ android_library {
	resource_dirs: ["res"],		resource_dirs: ["res"],
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	"src/com/android/printspooler/renderer/IPdfRenderer.aidl",
	"src/com/android/printspooler/renderer/IPdfEditor.aidl",		"src/com/android/printspooler/renderer/IPdfEditor.aidl",
			"src/com/android/printspooler/renderer/IPdfRenderer.aidl",
	],		],
	platform_apis: true,		platform_apis: true,
	static_libs: [		static_libs: [
	"android-support-v7-recyclerview",		"android-support-annotations",
	"android-support-compat",		"android-support-compat",
	"android-support-media-compat",
	"android-support-core-utils",
	"android-support-core-ui",		"android-support-core-ui",
			"android-support-core-utils",
	"android-support-fragment",		"android-support-fragment",
	"android-support-annotations",		"android-support-media-compat",
			"android-support-v7-recyclerview",
	"printspooler_aconfig_flags_java_lib",		"printspooler_aconfig_flags_java_lib",
	],		],
			flags_packages: [
			"printspooler_aconfig_declarations",
			],
	manifest: "AndroidManifest.xml",		manifest: "AndroidManifest.xml",
	}		}

packages/PrintSpooler/flags/flags.aconfig

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,3 +7,14 @@ flag {
	description: "Log print job creation and state transitions."		description: "Log print job creation and state transitions."
	bug: "385340868"		bug: "385340868"
	}		}

			flag {
			name: "print_edge2edge"
			namespace: "printing"
			description: "Enable edge to edge in print spooler"
			bug: "378652618"
			is_fixed_read_only: true
			metadata {
			purpose: PURPOSE_BUGFIX
			}
			}
			No newline at end of file

packages/PrintSpooler/res/layout/select_printer_activity.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@
	-->		-->

	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:id="@+id/select_printer"
	android:orientation="vertical"		android:orientation="vertical"
	android:layout_width="fill_parent"		android:layout_width="fill_parent"
	android:layout_height="fill_parent">		android:layout_height="fill_parent">

packages/PrintSpooler/res/values-night/themes.xml

+3 −3

packages/PrintSpooler/res/values/themes.xml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	limitations under the License.		limitations under the License.
	-->		-->

	<resources>		<resources xmlns:android="http://schemas.android.com/apk/res/android">
	<style name="Theme.AddPrinterActivity" parent="@android:style/Theme.DeviceDefault.Dialog">		<style name="Theme.AddPrinterActivity" parent="@android:style/Theme.DeviceDefault.Dialog">
	<item name="android:listSeparatorTextViewStyle">@style/ListSeparator</item>		<item name="android:listSeparatorTextViewStyle">@style/ListSeparator</item>
	<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>		<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>
	@@ -24,14 +24,14 @@
	<style name="Theme.SelectPrinterActivity"		<style name="Theme.SelectPrinterActivity"
	parent="android:style/Theme.DeviceDefault">		parent="android:style/Theme.DeviceDefault">
	<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>		<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>
	<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>		<item name="android:windowOptOutEdgeToEdgeEnforcement" android:featureFlag="!com.android.printspooler.flags.print_edge2edge">true</item>
	</style>		</style>

	<style name="Theme.PrintActivity" parent="@android:style/Theme.DeviceDefault">		<style name="Theme.PrintActivity" parent="@android:style/Theme.DeviceDefault">
	<item name="android:windowIsTranslucent">true</item>		<item name="android:windowIsTranslucent">true</item>
	<item name="android:windowActionBar">false</item>		<item name="android:windowActionBar">false</item>
	<item name="android:windowNoTitle">true</item>		<item name="android:windowNoTitle">true</item>
	<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>		<item name="android:windowOptOutEdgeToEdgeEnforcement" android:featureFlag="!com.android.printspooler.flags.print_edge2edge">true</item>
	</style>		</style>

	</resources>		</resources>

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	limitations under the License.		limitations under the License.
	-->		-->

	<resources>		<resources xmlns:android="http://schemas.android.com/apk/res/android">
	<style name="Theme.AddPrinterActivity" parent="@android:style/Theme.DeviceDefault.Light.Dialog">		<style name="Theme.AddPrinterActivity" parent="@android:style/Theme.DeviceDefault.Light.Dialog">
	<item name="android:listSeparatorTextViewStyle">@style/ListSeparator</item>		<item name="android:listSeparatorTextViewStyle">@style/ListSeparator</item>
	<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>		<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>
	@@ -24,7 +24,7 @@
	parent="android:style/Theme.DeviceDefault.Light">		parent="android:style/Theme.DeviceDefault.Light">
	<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>		<item name="android:textAppearanceListItemSecondary">@style/ListItemSecondary</item>
	<item name="android:windowLightStatusBar">true</item>		<item name="android:windowLightStatusBar">true</item>
	<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>		<item name="android:windowOptOutEdgeToEdgeEnforcement" android:featureFlag="!com.android.printspooler.flags.print_edge2edge">true</item>
	</style>		</style>

	<style name="Theme.PrintActivity" parent="@android:style/Theme.DeviceDefault.Light">		<style name="Theme.PrintActivity" parent="@android:style/Theme.DeviceDefault.Light">
	@@ -32,7 +32,7 @@
	<item name="android:windowActionBar">false</item>		<item name="android:windowActionBar">false</item>
	<item name="android:windowNoTitle">true</item>		<item name="android:windowNoTitle">true</item>
	<item name="android:windowLightStatusBar">true</item>		<item name="android:windowLightStatusBar">true</item>
	<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>		<item name="android:windowOptOutEdgeToEdgeEnforcement" android:featureFlag="!com.android.printspooler.flags.print_edge2edge">true</item>
	</style>		</style>

	</resources>		</resources>