Merge "Correct placement of 'Select all'." into arc-apps (390cd78b) · Commits · e / os / android_packages_apps_DocumentsUI

res/menu/activity.xml

+6 −7

Original line number	Diff line number	Diff line
		@@ -43,13 +43,6 @@
		android:title="@string/menu_list"
		android:icon="@drawable/ic_menu_view_list"
		android:showAsAction="always" />

		<item
		android:id="@+id/menu_select_all"
		android:title="@string/menu_select_all"
		android:alphabeticShortcut="a"
		android:showAsAction="never"
		android:visible="false" />
		<item
		android:id="@+id/menu_new_window"
		android:title="@string/menu_new_window"
		@@ -63,6 +56,12 @@
		android:alphabeticShortcut="e"
		android:showAsAction="never"
		android:visible="false" />
		<item
		android:id="@+id/menu_select_all"
		android:title="@string/menu_select_all"
		android:alphabeticShortcut="a"
		android:showAsAction="never"
		android:visible="false" />
		<item
		android:id="@+id/menu_advanced"
		android:showAsAction="never"

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,10 +20,6 @@

		<group
		android:id="@+id/menu_clipboard_group">
		<item
		android:id="@+id/menu_select_all"
		android:title="@string/menu_select_all" />

		<item
		android:id="@+id/menu_paste_from_clipboard"
		android:title="@string/menu_paste_from_clipboard" />
		@@ -34,5 +30,9 @@
		<item
		android:id="@+id/menu_create_dir"
		android:title="@string/menu_create_dir" />

		<item
		android:id="@+id/menu_select_all"
		android:title="@string/menu_select_all" />
		</group>
		</menu>
		No newline at end of file