Merge "Use menu shortcuts in ApiDemos" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-04-23 21:23:19 +00:00
committed by Android (Google) Code Review

View File

@@ -17,18 +17,23 @@
<item android:id="@+id/action_search" <item android:id="@+id/action_search"
android:icon="@android:drawable/ic_menu_search" android:icon="@android:drawable/ic_menu_search"
android:title="@string/action_bar_search" android:title="@string/action_bar_search"
android:alphabeticShortcut="s"
android:alphabeticModifiers="ALT"
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:actionViewClass="android.widget.SearchView" /> android:actionViewClass="android.widget.SearchView" />
<item android:id="@+id/action_add" <item android:id="@+id/action_add"
android:icon="@android:drawable/ic_menu_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" <item android:id="@+id/action_edit"
android:icon="@android:drawable/ic_menu_edit" android:icon="@android:drawable/ic_menu_edit"
android:showAsAction="always" android:showAsAction="always"
android:title="@string/action_bar_edit" /> android:title="@string/action_bar_edit"
android:alphabeticShortcut="e" />
<item android:id="@+id/action_share" <item android:id="@+id/action_share"
android:icon="@android:drawable/ic_menu_share" android:icon="@android:drawable/ic_menu_share"
android:title="@string/action_bar_share" android:title="@string/action_bar_share"
android:alphabeticShortcut="s"
android:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item android:id="@+id/action_sort" <item android:id="@+id/action_sort"
android:icon="@android:drawable/ic_menu_sort_by_size" android:icon="@android:drawable/ic_menu_sort_by_size"
@@ -38,10 +43,14 @@
<item android:id="@+id/action_sort_size" <item android:id="@+id/action_sort_size"
android:icon="@android:drawable/ic_menu_sort_by_size" android:icon="@android:drawable/ic_menu_sort_by_size"
android:title="@string/action_bar_sort_size" android:title="@string/action_bar_sort_size"
android:alphabeticShortcut="s"
android:alphabeticModifiers="CTRL|SHIFT"
android:onClick="onSort" /> android:onClick="onSort" />
<item android:id="@+id/action_sort_alpha" <item android:id="@+id/action_sort_alpha"
android:icon="@android:drawable/ic_menu_sort_alphabetically" android:icon="@android:drawable/ic_menu_sort_alphabetically"
android:title="@string/action_bar_sort_alpha" android:title="@string/action_bar_sort_alpha"
android:alphabeticShortcut="a"
android:alphabeticModifiers="CTRL|SHIFT"
android:onClick="onSort" /> android:onClick="onSort" />
</menu> </menu>
</item> </item>