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

Commit 0c7e7284 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Change font family for items in Cast dialog" into tm-dev am: 80dbdd63 am: 3386ba51 

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



Change-Id: I8c472d0f8690d1b446bdba602e54cf9d991d4fb1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e24fc49 3386ba51

packages/SystemUI/res/values/styles.xml

+10 −0
Original line number Diff line number Diff line
@@ -958,6 +958,16 @@ 
        <item name="android:textAlignment">center</item>

    </style>



    <!-- We explicitly overload this because we don't have control over the style or layout for

         the cast dialog items, as it's in `@android:layout/media_route_list_item. -->

    <style name="TextAppearance.CastItem" parent="@android:style/TextAppearance.DeviceDefault.Medium">

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

    </style>



    <style name="Theme.SystemUI.Dialog.Cast">

        <item name="android:textAppearanceMedium">@style/TextAppearance.CastItem</item>

    </style>

    <!-- ************************************************************************************* -->



    <style name="Widget" />

    <style name="Widget.Dialog" />

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ public class CastTile extends QSTileImpl<BooleanState> { 
                        mActivityStarter

                                .postStartActivityDismissingKeyguard(getLongClickIntent(), 0,

                                        controller);

                    }, R.style.Theme_SystemUI_Dialog, false /* showProgressBarWhenEmpty */);

                    }, R.style.Theme_SystemUI_Dialog_Cast, false /* showProgressBarWhenEmpty */);

            holder.init(dialog);

            SystemUIDialog.setShowForAllUsers(dialog, true);

            SystemUIDialog.registerDismissListener(dialog);