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

Commit a02965e2 authored by Andrei Stingaceanu's avatar Andrei Stingaceanu
Browse files

Keyboard shortcuts: UI polish 1 

* title color for system groups is now: "material_deep_teal_500"

* background behind shortcut keys:
** Now has 2dp rounded corners
** changed color from "material_grey_200" to "material_grey_100"

* the text items now have a minimum width equal to their height.
This means that now the text items with one character are always
the same (square) size as the icon items. Makes the UI look much
cleaner thus easier to read

* the line item now has a minimum height of 48dp and the content
is vertically centered

* minor variable renaming for increased readability

Bug: 28075364
Change-Id: Id7090b607b9c604c55513e7c393ed1084a1c8df0
parent 2b2b7ed8

packages/SystemUI/res/drawable/ksh_key_item_background.xml

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

<!--

  ~ Copyright (C) 2016 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

  -->

<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" />

</shape>

packages/SystemUI/res/layout/keyboard_shortcut_app_item.xml

+7 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
  ~ limitations under the License

  -->

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

        android:id="@+id/keyboard_shortcuts_keyword_wrapper"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="48dp"

        android:paddingStart="24dp"

        android:paddingEnd="24dp"

        android:paddingBottom="8dp">
@@ -29,7 +29,8 @@ 
            android:layout_marginEnd="32dp"

            android:layout_gravity="center_vertical"

            android:visibility="gone"

            android:layout_alignParentStart="true"/>

            android:layout_alignParentStart="true"

            android:layout_centerVertical="true"/>

    <TextView

            android:id="@+id/keyboard_shortcuts_keyword"

            android:layout_toEndOf="@+id/keyboard_shortcuts_icon"
@@ -41,7 +42,8 @@ 
            android:maxLines="5"

            android:singleLine="false"

            android:scrollHorizontally="false"

            android:layout_alignParentStart="true"/>

            android:layout_alignParentStart="true"

            android:layout_centerVertical="true"/>

    <com.android.systemui.statusbar.KeyboardShortcutKeysLayout

            android:id="@+id/keyboard_shortcuts_item_container"

            android:layout_toEndOf="@+id/keyboard_shortcuts_keyword"
@@ -50,5 +52,6 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentEnd="true"

            android:textSize="14sp"

            android:scrollHorizontally="false"/>

            android:scrollHorizontally="false"

            android:layout_centerVertical="true"/>

</RelativeLayout>

packages/SystemUI/res/layout/keyboard_shortcuts_key_icon_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,4 +21,4 @@ 
        android:padding="@dimen/ksh_item_padding"

        android:layout_marginStart="@dimen/ksh_item_margin_start"

        android:scaleType="fitXY"

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

packages/SystemUI/res/layout/keyboard_shortcuts_key_view.xml

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

          android:padding="@dimen/ksh_item_padding"

          android:layout_marginStart="@dimen/ksh_item_margin_start"

          android:background="@color/ksh_key_item_background"

          android:background="@drawable/ksh_key_item_background"

          android:textColor="@color/ksh_key_item_color"

          android:singleLine="true"

          android:gravity="center"

          android:textSize="@dimen/ksh_item_text_size"/>

packages/SystemUI/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -166,11 +166,11 @@ 
    <color name="switch_accent_color">#ff7fcac3</color>



    <!-- Keyboard shortcuts colors -->

    <color name="ksh_system_group_color">#ff00bcd4</color>

    <color name="ksh_system_group_color">@color/material_deep_teal_500</color>

    <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">#eeeeee</color>

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



    <!-- Background color of edit overflow -->

    <color name="qs_edit_overflow_bg">#455A64</color>