From 603a758caf9cc4050fa24eb9aaf4dff67b3d4f9e Mon Sep 17 00:00:00 2001
From: Vladislav Kaznacheev <kaznacheev@google.com>
Date: Tue, 17 Apr 2018 16:00:40 -0700
Subject: [PATCH] Use menu shortcuts in ApiDemos

Add alphabetic shortcuts to the menu in ActionBarUsage. This mirrors
what is already present in a similar support lib demo.

Bug: 31045453
Test: run com.example.android.apis.app.ActionBarUsage on a device
  with keyboard shortcuts enabled (such as Chromebook). Action menu
  items should display keyboard shortcuts.

Change-Id: I9e6b04df8e2a6cbc728cb60b3706d054521da7cb
---
 samples/ApiDemos/res/menu/actions.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/samples/ApiDemos/res/menu/actions.xml b/samples/ApiDemos/res/menu/actions.xml
index 9f0440c72..e319ce7bb 100644
--- a/samples/ApiDemos/res/menu/actions.xml
+++ b/samples/ApiDemos/res/menu/actions.xml
@@ -17,18 +17,23 @@
     <item android:id="@+id/action_search"
           android:icon="@android:drawable/ic_menu_search"
           android:title="@string/action_bar_search"
+          android:alphabeticShortcut="s"
+          android:alphabeticModifiers="ALT"
           android:showAsAction="ifRoom"
           android:actionViewClass="android.widget.SearchView" />
     <item android:id="@+id/action_add"
           android:icon="@android:drawable/ic_menu_add"
-          android:title="@string/action_bar_add" />
+          android:title="@string/action_bar_add"
+          android:alphabeticShortcut="a" />
     <item android:id="@+id/action_edit"
           android:icon="@android:drawable/ic_menu_edit"
           android:showAsAction="always"
-          android:title="@string/action_bar_edit" />
+          android:title="@string/action_bar_edit"
+          android:alphabeticShortcut="e" />
     <item android:id="@+id/action_share"
           android:icon="@android:drawable/ic_menu_share"
           android:title="@string/action_bar_share"
+          android:alphabeticShortcut="s"
           android:showAsAction="ifRoom" />
     <item android:id="@+id/action_sort"
           android:icon="@android:drawable/ic_menu_sort_by_size"
@@ -38,10 +43,14 @@
             <item android:id="@+id/action_sort_size"
                   android:icon="@android:drawable/ic_menu_sort_by_size"
                   android:title="@string/action_bar_sort_size"
+                  android:alphabeticShortcut="s"
+                  android:alphabeticModifiers="CTRL|SHIFT"
                   android:onClick="onSort" />
             <item android:id="@+id/action_sort_alpha"
                   android:icon="@android:drawable/ic_menu_sort_alphabetically"
                   android:title="@string/action_bar_sort_alpha"
+                  android:alphabeticShortcut="a"
+                  android:alphabeticModifiers="CTRL|SHIFT"
                   android:onClick="onSort" />
         </menu>
     </item>