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

Commit 001ac461 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

Shortcut Helper cancel icon fixes. 

 - Add hover effect / ripple on click
 - Pointer icon remains arrow (rather than change to hand)

Bug: 286538767
Flag: NA
Test: manual inspection
Change-Id: Id043211d4d2b30cb781f8e7ff592bc70a00cb3e9
parent ec75adac

packages/SystemUI/res/drawable/shortcut_search_cancel_button.xml

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

<!-- Copyright (C) 2023 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.

-->

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

  xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

<ripple android:color="?android:attr/colorControlHighlight" android:radius="24dp">

  <item>

    <shape android:shape="oval">

      <size android:width="24dp"

        android:height="24dp" />

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

    </shape>

  </item>

</ripple>

</inset>

packages/SystemUI/res/layout/keyboard_shortcuts_search_view.xml

+5 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
            android:hint="@string/keyboard_shortcut_search_list_hint"

            android:textColorHint="?android:attr/textColorTertiary" />



        <ImageView

        <ImageButton

            android:id="@+id/keyboard_shortcuts_search_cancel"

            android:layout_gravity="center_vertical|end"

            android:layout_width="wrap_content"
@@ -61,7 +61,10 @@ 
            android:layout_marginEnd="49dp"

            android:padding="16dp"

            android:contentDescription="@string/keyboard_shortcut_clear_text"

            android:src="@drawable/ic_shortcutlist_search_button_cancel" />

            android:src="@drawable/ic_shortcutlist_search_button_cancel"

            android:background="@drawable/shortcut_search_cancel_button"

            style="@android:style/Widget.Material.Button.Borderless.Small"

            android:pointerIcon="arrow" />

    </FrameLayout>



    <HorizontalScrollView

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

+4 −3
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.view.accessibility.AccessibilityNodeInfo; 
import android.widget.Button;

import android.widget.EditText;

import android.widget.FrameLayout;

import android.widget.ImageButton;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.RelativeLayout;
@@ -114,7 +115,6 @@ public final class KeyboardShortcutListSearch { 
    private Button mButtonInput;

    private Button mButtonOpenApps;

    private Button mButtonSpecificApp;

    private ImageView mEditTextCancel;

    private TextView mNoSearchResults;



    private final SparseArray<String> mSpecialCharacterNames = new SparseArray<>();
@@ -895,8 +895,9 @@ public final class KeyboardShortcutListSearch { 
                        // Do nothing.

                    }

                });

        mEditTextCancel = keyboardShortcutsView.findViewById(R.id.keyboard_shortcuts_search_cancel);

        mEditTextCancel.setOnClickListener(v -> mSearchEditText.setText(null));

        ImageButton editTextCancel = keyboardShortcutsView.findViewById(

                R.id.keyboard_shortcuts_search_cancel);

        editTextCancel.setOnClickListener(v -> mSearchEditText.setText(null));

    }



    private void populateKeyboardShortcutSearchList(LinearLayout keyboardShortcutsLayout) {