Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43846ddb authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Android (Google) Code Review
Browse files

Merge "Screen record UI polish" into sc-dev

parents 6ff6f1b0 3a6818bb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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] -->
+2 −1
Original line number Diff line number Diff line
@@ -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>
+2 −2
Original line number Diff line number Diff line
@@ -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();
    }
+1 −1
Original line number Diff line number Diff line
@@ -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);