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

Commit a71e36a0 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Align shortcut helper components to spec 

 - update left/right margins
 - Reconcile key icon/text views with small-screen helper
 - Replace non-meta icons with text labels
 - various padding, sizing, colour tweaks to align with design spec
 - Fix a bug where the wrong context was used to load resources
 - Remove overscroll on shortcut list view
 - Replace vertical bar with string for shortcut separator
 - Remove '+' between keys
 - Update arrow key strings

Bug: 286538767
Test: inspection
Flag: NA
Change-Id: I18e65a8c7f16f368c9774f399c458749b1f4ce80
parent 769d6612

packages/SystemUI/res/drawable/ksh_key_item_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

        android:shape="rectangle">

    <solid android:color="@color/ksh_key_item_background" />

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

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

</shape>

packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml

+2 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="48dp"

        android:paddingStart="24dp"

        android:paddingEnd="24dp"

        android:paddingBottom="8dp">

    <ImageView

            android:id="@+id/keyboard_shortcuts_icon"
@@ -57,5 +55,6 @@ 
            android:layout_alignParentEnd="true"

            android:textSize="14sp"

            android:scrollHorizontally="false"

            android:layout_centerVertical="true"/>

            android:layout_centerVertical="true"

            android:padding="0dp" />

</com.android.systemui.statusbar.KeyboardShortcutAppItemLayout>

packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml

+0 −2
Original line number Diff line number Diff line
@@ -21,7 +21,5 @@ 
          android:textSize="14sp"

          android:fontFamily="sans-serif-medium"

          android:importantForAccessibility="yes"

          android:paddingStart="24dp"

          android:paddingTop="20dp"

          android:paddingEnd="24dp"

          android:paddingBottom="10dp"/>

packages/SystemUI/res/layout/keyboard_shortcuts_key_icon_view.xml

+7 −2
Original line number Diff line number Diff line
@@ -18,7 +18,12 @@ 
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="@dimen/ksh_item_padding"

        android:minWidth="48dp"

        android:minHeight="32dp"

        android:paddingLeft="@dimen/ksh_key_view_padding_horizontal"

        android:paddingRight="@dimen/ksh_key_view_padding_horizontal"

        android:paddingTop="@dimen/ksh_key_view_padding_vertical"

        android:paddingBottom="@dimen/ksh_key_view_padding_vertical"

        android:layout_marginStart="@dimen/ksh_item_margin_start"

        android:scaleType="fitXY"

        android:scaleType="matrix"

        android:background="@drawable/ksh_key_item_background" />

packages/SystemUI/res/layout/keyboard_shortcuts_key_new_icon_view.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

           android:layout_width="wrap_content"

           android:layout_height="wrap_content"

           android:padding="@dimen/ksh_item_padding"

           android:layout_marginLeft="0dp"

           android:layout_marginRight="0dp"

           android:scaleType="fitXY"

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

           style="@style/ShortcutItemBackground" />
 
 No newline at end of file