summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/res/values/strings.xml2
-rw-r--r--packages/SystemUI/res/values/styles.xml3
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java2
4 files changed, 6 insertions, 5 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 71382f3d0a95..01d0dde6da5e 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -983,7 +983,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 e6c1f6c894b9..ecc60ecf5a69 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 2f0bbdb88c1c..c6b5eb7508af 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 2b62a29587e6..57125f34731c 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);