From 3a6818bb9965733ea32d1d1d19adb3fc51faa12b Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Thu, 13 May 2021 20:41:43 -0400
Subject: [PATCH] Screen record UI polish

- Fix capitalization
- Default to device audio
- Use showBigPictureWhenCollapsed instead of setting largeIcon
separately
- Update styles to inherit device default

Fixes: 185544094
Fixes: 185544175
Fixes: 186427367
Fixes: 185544265
Test: visual

Change-Id: Ic545f8bc0ef77aabaab24a4585c87c3aa29ac7f5
---
 packages/SystemUI/res/values/strings.xml                      | 2 +-
 packages/SystemUI/res/values/styles.xml                       | 3 ++-
 .../com/android/systemui/screenrecord/RecordingService.java   | 4 ++--
 .../com/android/systemui/screenrecord/ScreenRecordDialog.java | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 427ede51ad9c4..3cf8ed6e56ded 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -989,7 +989,7 @@
     <string name="quick_settings_nfc_on">NFC is enabled</string>
 
     <!-- QuickSettings: Screen record tile [CHAR LIMIT=NONE] -->
-    <string name="quick_settings_screen_record_label">Screen Record</string>
+    <string name="quick_settings_screen_record_label">Screen record</string>
     <!-- QuickSettings: Text to prompt the user to begin a new recording [CHAR LIMIT=20] -->
     <string name="quick_settings_screen_record_start">Start</string>
     <!-- QuickSettings: Text to prompt the user to stop an ongoing recording [CHAR LIMIT=20] -->
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 9fa63dd1613db..23721c8654a9c 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -682,7 +682,8 @@
     </style>
 
     <!-- Screen recording -->
-    <style name="ScreenRecord" parent="Theme.SystemUI.Dialog.GlobalActions">
+    <style name="ScreenRecord" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowIsFloating">true</item>
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
index 2f0bbdb88c1c4..c6b5eb7508af0 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java
@@ -367,8 +367,8 @@ public class RecordingService extends Service implements MediaRecorder.OnInfoLis
         if (thumbnailBitmap != null) {
             Notification.BigPictureStyle pictureStyle = new Notification.BigPictureStyle()
                     .bigPicture(thumbnailBitmap)
-                    .bigLargeIcon((Bitmap) null);
-            builder.setLargeIcon(thumbnailBitmap).setStyle(pictureStyle);
+                    .showBigPictureWhenCollapsed(true);
+            builder.setStyle(pictureStyle);
         }
         return builder.build();
     }
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java
index 2b62a29587e69..57125f34731cc 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java
@@ -90,8 +90,8 @@ public class ScreenRecordDialog extends Activity {
         });
 
         mModes = new ArrayList<>();
-        mModes.add(MIC);
         mModes.add(INTERNAL);
+        mModes.add(MIC);
         mModes.add(MIC_AND_INTERNAL);
 
         mAudioSwitch = findViewById(R.id.screenrecord_audio_switch);