Merge "Screen record UI polish" into sc-dev

This commit is contained in:
Beth Thibodeau
2021-05-20 21:34:55 +00:00
committed by Android (Google) Code Review
4 changed files with 6 additions and 5 deletions

View File

@@ -983,7 +983,7 @@
<string name="quick_settings_nfc_on">NFC is enabled</string> <string name="quick_settings_nfc_on">NFC is enabled</string>
<!-- QuickSettings: Screen record tile [CHAR LIMIT=NONE] --> <!-- 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] --> <!-- QuickSettings: Text to prompt the user to begin a new recording [CHAR LIMIT=20] -->
<string name="quick_settings_screen_record_start">Start</string> <string name="quick_settings_screen_record_start">Start</string>
<!-- QuickSettings: Text to prompt the user to stop an ongoing recording [CHAR LIMIT=20] --> <!-- QuickSettings: Text to prompt the user to stop an ongoing recording [CHAR LIMIT=20] -->

View File

@@ -682,7 +682,8 @@
</style> </style>
<!-- Screen recording --> <!-- 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:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowIsFloating">true</item> <item name="android:windowIsFloating">true</item>

View File

@@ -367,8 +367,8 @@ public class RecordingService extends Service implements MediaRecorder.OnInfoLis
if (thumbnailBitmap != null) { if (thumbnailBitmap != null) {
Notification.BigPictureStyle pictureStyle = new Notification.BigPictureStyle() Notification.BigPictureStyle pictureStyle = new Notification.BigPictureStyle()
.bigPicture(thumbnailBitmap) .bigPicture(thumbnailBitmap)
.bigLargeIcon((Bitmap) null); .showBigPictureWhenCollapsed(true);
builder.setLargeIcon(thumbnailBitmap).setStyle(pictureStyle); builder.setStyle(pictureStyle);
} }
return builder.build(); return builder.build();
} }

View File

@@ -90,8 +90,8 @@ public class ScreenRecordDialog extends Activity {
}); });
mModes = new ArrayList<>(); mModes = new ArrayList<>();
mModes.add(MIC);
mModes.add(INTERNAL); mModes.add(INTERNAL);
mModes.add(MIC);
mModes.add(MIC_AND_INTERNAL); mModes.add(MIC_AND_INTERNAL);
mAudioSwitch = findViewById(R.id.screenrecord_audio_switch); mAudioSwitch = findViewById(R.id.screenrecord_audio_switch);