From 4429ee6d93b955ec492b618ebf1fffe96f12bf4a Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Mon, 4 May 2020 12:44:41 -0400
Subject: [PATCH] Fix redlines and strings in Controls dialog

Also, make sure that it appears on top of the app

Fixes: 155205745
Test: manual
Change-Id: I56ebae4ef6bdf1c89850a4ad70be05b37e3cd0cb
---
 packages/SystemUI/AndroidManifest.xml                       | 2 +-
 packages/SystemUI/res/layout/controls_dialog.xml            | 2 --
 packages/SystemUI/res/values/dimens.xml                     | 2 +-
 packages/SystemUI/res/values/strings.xml                    | 6 +++---
 packages/SystemUI/res/values/styles.xml                     | 6 +++++-
 .../systemui/controls/management/ControlsRequestReceiver.kt | 1 +
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 1306657ae403f..393674372d815 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -718,7 +718,7 @@
             android:finishOnCloseSystemDialogs="true"
             android:showForAllUsers="true"
             android:clearTaskOnLaunch="true"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
             android:excludeFromRecents="true"
             android:visibleToInstantApps="true"/>
diff --git a/packages/SystemUI/res/layout/controls_dialog.xml b/packages/SystemUI/res/layout/controls_dialog.xml
index 3effaf5fac5bc..5ce9916b04891 100644
--- a/packages/SystemUI/res/layout/controls_dialog.xml
+++ b/packages/SystemUI/res/layout/controls_dialog.xml
@@ -18,8 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/controls_dialog_padding"
-    android:layout_margin="@dimen/controls_dialog_padding"
     >
 
     <include
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index c68c814532fee..2cbb49801aa85 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1310,7 +1310,7 @@
     <dimen name="controls_card_margin">2dp</dimen>
     <item name="control_card_elevation" type="dimen" format="float">15</item>
 
-    <dimen name="controls_dialog_padding">8dp</dimen>
+    <dimen name="controls_dialog_padding">32dp</dimen>
     <dimen name="controls_dialog_control_width">200dp</dimen>
 
     <!-- Screen Record -->
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 2b3e661c4f7ea..96843f187f727 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2710,9 +2710,9 @@
     <!-- Controls dialog title [CHAR LIMIT=40] -->
     <string name="controls_dialog_title">Add to device controls</string>
     <!-- Controls dialog add to favorites [CHAR LIMIT=40] -->
-    <string name="controls_dialog_ok">Add to favorites</string>
-    <!-- Controls dialog message [CHAR LIMIT=NONE] -->
-    <string name="controls_dialog_message"><xliff:g id="app" example="System UI">%s</xliff:g> suggested this control to add to your favorites.</string>
+    <string name="controls_dialog_ok">Add</string>
+    <!-- Controls dialog message. Indicates app that suggested this control [CHAR LIMIT=NONE] -->
+    <string name="controls_dialog_message">Suggested by <xliff:g id="app" example="System UI">%s</xliff:g></string>
     <!-- Controls dialog confirmation [CHAR LIMIT=30] -->
     <string name="controls_dialog_confirmation">Controls updated</string>
 
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 6e25625d3b884..b5e7f4bc061e6 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -768,6 +768,10 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="Theme.ControlsRequestDialog" parent="@style/Theme.SystemUI.MediaProjectionAlertDialog"/>
+    <!-- The attributes used for title (textAppearanceLarge) and message (textAppearanceMedium)
+         are already as necessary:
+          * Title: headline, medium 20sp
+          * Message: body, 16 sp -->
+    <style name="Theme.ControlsRequestDialog" parent="@*android:style/Theme.DeviceDefault.Dialog.Alert"/>
 
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsRequestReceiver.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsRequestReceiver.kt
index 5c30b5a5bf45d..0d23557ffa9ee 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsRequestReceiver.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsRequestReceiver.kt
@@ -70,6 +70,7 @@ class ControlsRequestReceiver : BroadcastReceiver() {
             ControlsProviderService.EXTRA_CONTROL.let {
                 putExtra(it, intent.getParcelableExtra<Control>(it))
             }
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
         }
         activityIntent.putExtra(Intent.EXTRA_USER_ID, context.userId)