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

Commit 02c4d540 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Update Shortcut Help buttons 

 - Correct colours to UX spec
 - Update margins/button size to match design spec
 - Arrow pointer instead of hand

Bug: 286538767
Test: Inspection
Flag: NA
Change-Id: If2b06b7e1c52aafbcc3db9bd6c1da51521535e1f
parent 001ac461

packages/SystemUI/res/drawable/shortcut_button_colored.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        <item>

            <shape android:shape="rectangle">

                <corners android:radius="16dp"/>

                <solid android:color="?androidprv:attr/colorSurface"/>

                <solid android:color="?androidprv:attr/materialColorSurfaceBright"/>

            </shape>

        </item>

    </ripple>

packages/SystemUI/res/drawable/shortcut_button_focus_colored.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        <item>

            <shape android:shape="rectangle">

                <corners android:radius="16dp"/>

                <solid android:color="?androidprv:attr/colorAccentPrimary"/>

                <solid android:color="?androidprv:attr/materialColorPrimary"/>

            </shape>

        </item>

    </ripple>

packages/SystemUI/res/layout/keyboard_shortcuts_search_view.xml

+1 −5
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
                android:id="@+id/shortcut_system"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"

                android:text="@string/keyboard_shortcut_search_category_system" />
@@ -93,7 +92,6 @@ 
                android:id="@+id/shortcut_input"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"

                android:text="@string/keyboard_shortcut_search_category_input"/>
@@ -101,7 +99,6 @@ 
                android:id="@+id/shortcut_open_apps"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"

                android:text="@string/keyboard_shortcut_search_category_open_apps"/>
@@ -109,7 +106,6 @@ 
                android:id="@+id/shortcut_specific_app"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                style="@style/ShortCutButton"

                android:text="@string/keyboard_shortcut_search_category_current_app"/>

        </LinearLayout>

packages/SystemUI/res/values/styles.xml

+8 −4
Original line number Diff line number Diff line
@@ -1491,10 +1491,14 @@ 


    <style name="ShortCutButton" parent="@android:style/Widget.Material.Button">

        <item name="android:background">@drawable/shortcut_button_colored</item>

        <item name="android:stateListAnimator">@null</item>

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

        <item name="android:padding">4dp</item>

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

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

        <item name="android:layout_marginEnd">12dp</item>

        <item name="android:paddingLeft">24dp</item>

        <item name="android:paddingRight">24dp</item>

        <item name="android:minHeight">40dp</item>

        <item name="android:stateListAnimator">@*android:anim/flat_button_state_list_anim_material</item>

        <item name="android:pointerIcon">arrow</item>

    </style>



    <style name="ShortcutHorizontalDivider">

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

+2 −2
Original line number Diff line number Diff line
@@ -1277,12 +1277,12 @@ public final class KeyboardShortcutListSearch { 


    private int getColorOfTextColorOnAccent() {

        return Utils.getColorAttrDefaultColor(

                mContext, com.android.internal.R.attr.textColorOnAccent);

                mContext, com.android.internal.R.attr.materialColorOnPrimary);

    }



    private int getColorOfTextColorSecondary() {

        return Utils.getColorAttrDefaultColor(

                mContext, com.android.internal.R.attr.textColorSecondary);

                mContext, com.android.internal.R.attr.materialColorOnSurface);

    }



    // Create the new data structure for handling the N-to-1 key mapping and other complex case.