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

Commit ef5c4dbf authored by Ben Murdoch's avatar Ben Murdoch Committed by Android (Google) Code Review
Browse files

Merge "Update keyboard shortcut helper design spec." into main

parents a6cf9c11 a65ccfb0

packages/SystemUI/res/anim/slide_in_up.xml

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

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

-->



<translate

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

    android:fromYDelta="100%p"

    android:toYDelta="0"

    android:duration="@android:integer/config_shortAnimTime" />

packages/SystemUI/res/anim/slide_out_down.xml

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

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

-->



<translate

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

    android:fromYDelta="0"

    android:toYDelta="100%p"

    android:duration="@android:integer/config_shortAnimTime" />

packages/SystemUI/res/drawable/ic_shortcutlist_search.xml

+5 −2
Original line number Diff line number Diff line
@@ -14,12 +14,15 @@ 
  limitations under the License

  -->

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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="48"

        android:viewportHeight="48"

        android:tint="?android:attr/textColorSecondary">

        android:tint="?androidprv:attr/materialColorOnSurfaceVariant">

    <path

        android:fillColor="@android:color/white"

        android:strokeColor="@android:color/white"

        android:strokeWidth="2"

        android:pathData="M39.8,41.95 L26.65,28.8Q25.15,30.1 23.15,30.825Q21.15,31.55 18.9,31.55Q13.5,31.55 9.75,27.8Q6,24.05 6,18.75Q6,13.45 9.75,9.7Q13.5,5.95 18.85,5.95Q24.15,5.95 27.875,9.7Q31.6,13.45 31.6,18.75Q31.6,20.9 30.9,22.9Q30.2,24.9 28.8,26.65L42,39.75ZM18.85,28.55Q22.9,28.55 25.75,25.675Q28.6,22.8 28.6,18.75Q28.6,14.7 25.75,11.825Q22.9,8.95 18.85,8.95Q14.75,8.95 11.875,11.825Q9,14.7 9,18.75Q9,22.8 11.875,25.675Q14.75,28.55 18.85,28.55Z"/>

</vector>

packages/SystemUI/res/drawable/shortcut_button_colored.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle">

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

              <corners android:radius="@dimen/ksh_button_corner_radius"/>

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

            </shape>

        </item>

packages/SystemUI/res/drawable/shortcut_button_focus_colored.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:color="?android:attr/colorControlHighlight">

        <item>

            <shape android:shape="rectangle">

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

              <corners android:radius="@dimen/ksh_button_corner_radius"/>

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

            </shape>

        </item>