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

Commit 25cc14ea authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix redlines and strings in Controls dialog" into rvc-dev am: e34b1324 am: 2049c6b5

Change-Id: I4f9ae3a5ae4ffea24c0d2688f2d8f495990df04a
parents e7a8dad0 2049c6b5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,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"/>
+0 −2
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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 -->
+3 −3
Original line number Diff line number Diff line
@@ -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>

+5 −1
Original line number Diff line number Diff line
@@ -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>
Loading