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

Commit 3a71e091 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Automerger Merge Worker
Browse files

Merge "Update letterbox restart dialog style to match other Android U dialogs"... 

Merge "Update letterbox restart dialog style to match other Android U dialogs" into udc-dev am: 565b8127

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23561836



Change-Id: I7f119d37883e11dc249ce493eadd2d71f0450b8b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4d39050 565b8127

libs/WindowManager/Shell/res/values/styles.xml

+12 −40
Original line number Diff line number Diff line
@@ -93,62 +93,34 @@ 
    <style name="RestartDialogTitleText">

        <item name="android:textSize">24sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:lineSpacingExtra">2sp</item>

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Headline

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamilyMedium

        </item>

        <item name="android:lineSpacingExtra">8sp</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>



    <style name="RestartDialogBodyText">

    <style name="RestartDialogBodyStyle">

        <item name="android:textSize">14sp</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

    </style>



    <style name="RestartDialogBodyText" parent="RestartDialogBodyStyle">

        <item name="android:letterSpacing">0.02</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:lineSpacingExtra">2sp</item>

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Body2

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamily

        </item>

        <item name="android:lineSpacingExtra">6sp</item>

    </style>



    <style name="RestartDialogCheckboxText">

        <item name="android:textSize">16sp</item>

    <style name="RestartDialogCheckboxText" parent="RestartDialogBodyStyle">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:lineSpacingExtra">4sp</item>

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Headline

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamilyMedium

        </item>

        <item name="android:lineSpacingExtra">6sp</item>

    </style>



    <style name="RestartDialogDismissButton">

    <style name="RestartDialogDismissButton" parent="RestartDialogBodyStyle">

        <item name="android:lineSpacingExtra">2sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Body2

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamily

        </item>

    </style>



    <style name="RestartDialogConfirmButton">

    <style name="RestartDialogConfirmButton" parent="RestartDialogBodyStyle">

        <item name="android:lineSpacingExtra">2sp</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Body2

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamily

        </item>

    </style>



    <style name="ReachabilityEduHandLayout" parent="Theme.AppCompat.Light">