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

Commit 50a7fe8e authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Add Meta + F shortcut for opening files" into main

parents e4217d02 0419c529

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -6876,6 +6876,8 @@ ul.</string> 
    <string name="keyboard_shortcut_group_applications_calculator">Calculator</string>

    <!-- User visible title for the keyboard shortcut that takes the user to the maps app. [CHAR LIMIT=70] -->

    <string name="keyboard_shortcut_group_applications_maps">Maps</string>

    <!-- User visible title for the keyboard shortcut that takes the user to the files app. [CHAR LIMIT=70] -->

    <string name="keyboard_shortcut_group_applications_files">Files</string>

    <!-- User visible title for the keyboard shortcut group containing system-wide application launch shortcuts. [CHAR-LIMIT=70] -->

    <string name="keyboard_shortcut_group_applications">Applications</string>

























core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -6120,6 +6120,7 @@













  <java-symbol type="string" name="keyboard_shortcut_group_applications_calendar" />















  <java-symbol type="string" name="keyboard_shortcut_group_applications_contacts" />















  <java-symbol type="string" name="keyboard_shortcut_group_applications_email" />













  <java-symbol type="string" name="keyboard_shortcut_group_applications_files" />















  <java-symbol type="string" name="keyboard_shortcut_group_applications_maps" />















  <java-symbol type="string" name="keyboard_shortcut_group_applications_music" />















  <java-symbol type="string" name="keyboard_shortcut_group_applications_sms" />

































core/res/res/xml/bookmarks.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -52,4 +52,8 @@













        category="android.intent.category.APP_CALCULATOR"















        androidprv:keycode="KEYCODE_U"















        androidprv:modifierState="META" />













    <bookmark













        category="android.intent.category.APP_FILES"













        androidprv:keycode="KEYCODE_F"













        androidprv:modifierState="META" />















</bookmarks>
























services/core/java/com/android/server/policy/ModifierShortcutManager.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -251,6 +251,9 @@ public class ModifierShortcutManager {













            case Intent.CATEGORY_APP_CALCULATOR:















                resid = R.string.keyboard_shortcut_group_applications_calculator;















                break;













            case Intent.CATEGORY_APP_FILES:













                resid = R.string.keyboard_shortcut_group_applications_files;













                break;















            default:















                Log.e(TAG, ("No label for app category " + category));















                return null;

































tests/Input/res/xml/bookmarks.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -41,6 +41,10 @@













        category="android.intent.category.APP_CALCULATOR"















        androidprv:keycode="KEYCODE_U"















        androidprv:modifierState="META" />













    <bookmark













        category="android.intent.category.APP_FILES"













        androidprv:keycode="KEYCODE_F"













        androidprv:modifierState="META" />































    <bookmark















        role="android.app.role.BROWSER"