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

Commit c85d6c25 authored by Salvador Martinez's avatar Salvador Martinez
Browse files

Switch keyboard shortcuts helper to daynight theme 

This one was hardcoded to use light theme, switch it to daynight
so that it switches properly in dark theme. Also the text colors
were hardcoded so I fixed that as well.

Test: visual inspection
Bug: 114520166
Change-Id: Ic4789d0dfec7a7af4a49b37909ee0827ea1554bc
parent 8502e24c

packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
            android:layout_height="wrap_content"

            android:paddingEnd="12dp"

            android:paddingBottom="4dp"

            android:textColor="@color/ksh_keyword_color"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="16sp"

            android:maxLines="5"

            android:singleLine="false"

packages/SystemUI/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 


    <!-- Keyboard shortcuts colors -->

    <color name="ksh_application_group_color">#fff44336</color>

    <color name="ksh_keyword_color">#d9000000</color>

    <color name="ksh_key_item_color">@color/material_grey_600</color>

    <color name="ksh_key_item_background">@color/material_grey_100</color>

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ public final class KeyboardShortcuts { 
    private KeyCharacterMap mBackupKeyCharacterMap;



    private KeyboardShortcuts(Context context) {

        this.mContext = new ContextThemeWrapper(context, android.R.style.Theme_DeviceDefault_Light);

        this.mContext = new ContextThemeWrapper(

                context, android.R.style.Theme_DeviceDefault_Settings);

        this.mPackageManager = AppGlobals.getPackageManager();

        loadResources(context);

    }