Merge "Controls UI - Suggested controls" into rvc-dev (653604d0) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/controls_no_favorites.xml

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -40,14 +40,20 @@
	android:paddingBottom="8dp" />		android:paddingBottom="8dp" />

	<TextView		<TextView
			style="@style/TextAppearance.ControlSetup.Title"
	android:id="@+id/controls_title"		android:id="@+id/controls_title"
	android:text="@string/quick_controls_title"		android:text="@string/quick_controls_title"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:singleLine="true"		android:layout_gravity="center" />
	android:layout_gravity="center"
	android:textSize="25sp"		<TextView
	android:textColor="@*android:color/foreground_material_dark"		style="@style/TextAppearance.ControlSetup.Subtitle"
	android:fontFamily="@*android:string/config_headlineFontFamily" />		android:id="@+id/controls_subtitle"
			android:visibility="gone"
			android:layout_marginTop="12dp"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_gravity="center" />
	</LinearLayout>		</LinearLayout>
	</merge>		</merge>

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -532,4 +532,8 @@
	<!-- Respect drawable/rounded.xml intrinsic size for multiple radius corner path customization -->		<!-- Respect drawable/rounded.xml intrinsic size for multiple radius corner path customization -->
	<bool name="config_roundedCornerMultipleRadius">false</bool>		<bool name="config_roundedCornerMultipleRadius">false</bool>

			<!-- Controls can query a preferred application for limited number of suggested controls.
			This config value should contain the package name of that preferred application.
			-->
			<string translatable="false" name="config_controlsPreferredPackage"></string>
	</resources>		</resources>

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2657,4 +2657,8 @@

	<!-- Tooltip to show in management screen when there are multiple structures [CHAR_LIMIT=50] -->		<!-- Tooltip to show in management screen when there are multiple structures [CHAR_LIMIT=50] -->
	<string name="controls_structure_tooltip">Swipe to see other structures</string>		<string name="controls_structure_tooltip">Swipe to see other structures</string>

			<!-- Message to tell the user to wait while systemui attempts to load a set of
			recommended controls [CHAR_LIMIT=30] -->
			<string name="controls_seeding_in_progress">Loading recommendations</string>
	</resources>		</resources>

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -699,6 +699,20 @@
	<item name="*android:colorPopupBackground">@color/control_list_popup_background</item>		<item name="*android:colorPopupBackground">@color/control_list_popup_background</item>
	</style>		</style>

			<style name="TextAppearance.ControlSetup">
			<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
			<item name="android:textColor">@color/control_primary_text</item>
			<item name="android:singleLine">true</item>
			</style>

			<style name="TextAppearance.ControlSetup.Title">
			<item name="android:textSize">25sp</item>
			</style>

			<style name="TextAppearance.ControlSetup.Subtitle">
			<item name="android:textSize">16sp</item>
			</style>

	<style name="Theme.ControlsRequestDialog" parent="@style/Theme.SystemUI.MediaProjectionAlertDialog"/>		<style name="Theme.ControlsRequestDialog" parent="@style/Theme.SystemUI.MediaProjectionAlertDialog"/>

	</resources>		</resources>

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,14 @@ interface ControlsBindingController : UserAwareController {
	*/		*/
	fun bindAndLoad(component: ComponentName, callback: LoadCallback): Runnable		fun bindAndLoad(component: ComponentName, callback: LoadCallback): Runnable

			/**
			* Request bind to a service and load a limited number of suggested controls.
			*
			* @param component The [ComponentName] of the service to bind
			* @param callback a callback to return the loaded controls to (or an error).
			*/
			fun bindAndLoadSuggested(component: ComponentName, callback: LoadCallback)

	/**		/**
	* Request to bind to the given service.		* Request to bind to the given service.
	*		*