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

Commit 4429ee6d authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Fix redlines and strings in Controls dialog 

Also, make sure that it appears on top of the app

Fixes: 155205745
Test: manual
Change-Id: I56ebae4ef6bdf1c89850a4ad70be05b37e3cd0cb
parent 5ef61d2f

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,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"/>

packages/SystemUI/res/layout/controls_dialog.xml

+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

packages/SystemUI/res/values/dimens.xml

+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 -->

packages/SystemUI/res/values/strings.xml

+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>

packages/SystemUI/res/values/styles.xml

+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>