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

Commit 2121faff authored by Chris Göllner's avatar Chris Göllner
Browse files

Shortcut Helper - Add "back", "home", and "recents" keys in system shortcuts 

Flag: com.android.systemui.keyboard_shortcut_helper_rewrite
Test: Manually
Fixes: 353894417
Change-Id: I09c162e341b6e6855f3973fd5305bc30ce01df8c
parent 2503781f

packages/SystemUI/res/drawable/ic_arrow_back_2.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="960"

    android:viewportWidth="960">

    <path

        android:fillColor="#000"

        android:pathData="M640,760L200,480L640,200L640,760ZM560,480L560,480L560,480ZM560,614L560,346L350,480L560,614Z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_check_box_outline_blank.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="#000"

        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760Z"/>

</vector>

packages/SystemUI/res/drawable/ic_radio_button_unchecked.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="#000"

        android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>

</vector>

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutHelperKeys.kt

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import android.view.KeyEvent.KEYCODE_NUM_LOCK 
import android.view.KeyEvent.KEYCODE_PAGE_DOWN

import android.view.KeyEvent.KEYCODE_PAGE_UP

import android.view.KeyEvent.KEYCODE_PERIOD

import android.view.KeyEvent.KEYCODE_RECENT_APPS

import android.view.KeyEvent.KEYCODE_SCROLL_LOCK

import android.view.KeyEvent.KEYCODE_SHIFT_LEFT

import android.view.KeyEvent.KEYCODE_SHIFT_RIGHT
@@ -118,6 +119,9 @@ object ShortcutHelperKeys { 
    val keyIcons =

        mapOf(

            META_META_ON to R.drawable.ic_ksh_key_meta,

            KEYCODE_BACK to R.drawable.ic_arrow_back_2,

            KEYCODE_HOME to R.drawable.ic_radio_button_unchecked,

            KEYCODE_RECENT_APPS to R.drawable.ic_check_box_outline_blank,

        )



    val specialKeyLabels =

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt

+15 −0
Original line number Diff line number Diff line
@@ -18,14 +18,17 @@ package com.android.systemui.keyboard.shortcut.data.source 


import android.content.res.Resources

import android.view.KeyEvent.KEYCODE_A

import android.view.KeyEvent.KEYCODE_BACK

import android.view.KeyEvent.KEYCODE_DEL

import android.view.KeyEvent.KEYCODE_DPAD_LEFT

import android.view.KeyEvent.KEYCODE_ENTER

import android.view.KeyEvent.KEYCODE_ESCAPE

import android.view.KeyEvent.KEYCODE_H

import android.view.KeyEvent.KEYCODE_HOME

import android.view.KeyEvent.KEYCODE_I

import android.view.KeyEvent.KEYCODE_L

import android.view.KeyEvent.KEYCODE_N

import android.view.KeyEvent.KEYCODE_RECENT_APPS

import android.view.KeyEvent.KEYCODE_S

import android.view.KeyEvent.KEYCODE_SLASH

import android.view.KeyEvent.KEYCODE_TAB
@@ -60,8 +63,12 @@ class SystemShortcutsSource @Inject constructor(@Main private val resources: Res 
                command(META_META_ON)

            },

            // Access home screen:

            //  - Home button

            //  - Meta + H

            //  - Meta + Enter

            shortcutInfo(resources.getString(R.string.group_system_access_home_screen)) {

                command(modifiers = 0, KEYCODE_HOME)

            },

            shortcutInfo(resources.getString(R.string.group_system_access_home_screen)) {

                command(META_META_ON, KEYCODE_H)

            },
@@ -69,14 +76,22 @@ class SystemShortcutsSource @Inject constructor(@Main private val resources: Res 
                command(META_META_ON, KEYCODE_ENTER)

            },

            // Overview of open apps:

            //  - Recent apps button

            //  - Meta + Tab

            shortcutInfo(resources.getString(R.string.group_system_overview_open_apps)) {

                command(modifiers = 0, KEYCODE_RECENT_APPS)

            },

            shortcutInfo(resources.getString(R.string.group_system_overview_open_apps)) {

                command(META_META_ON, KEYCODE_TAB)

            },

            // Back: go back to previous state (back button)

            //  - Back button

            //  - Meta + Escape OR

            //  - Meta + Backspace OR

            //  - Meta + Left arrow

            shortcutInfo(resources.getString(R.string.group_system_go_back)) {

                command(modifiers = 0, KEYCODE_BACK)

            },

            shortcutInfo(resources.getString(R.string.group_system_go_back)) {

                command(META_META_ON, KEYCODE_ESCAPE)

            },