Merge "Reorder home settings Bug: 62957388" into ub-launcher3-dorval-polish

This commit is contained in:
Hyunyoung Song 2017-06-26 20:41:38 +00:00 committed by Android (Google) Code Review
commit 32a1e2cd48
1 changed files with 17 additions and 17 deletions

View File

@ -16,23 +16,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference
android:key="pref_add_icon_to_home"
android:title="@string/auto_add_shortcuts_label"
android:summary="@string/auto_add_shortcuts_description"
android:defaultValue="true"
android:persistent="true"
/>
<ListPreference
android:key="pref_override_icon_shape"
android:title="@string/icon_shape_override_label"
android:summary="%s"
android:entries="@array/icon_shape_override_paths_names"
android:entryValues="@array/icon_shape_override_paths_values"
android:defaultValue=""
android:persistent="false" />
<Preference
android:key="pref_icon_badging"
android:title="@string/icon_badging_title"
@ -45,6 +28,14 @@
</intent>
</Preference>
<SwitchPreference
android:key="pref_add_icon_to_home"
android:title="@string/auto_add_shortcuts_label"
android:summary="@string/auto_add_shortcuts_description"
android:defaultValue="true"
android:persistent="true"
/>
<SwitchPreference
android:key="pref_allowRotation"
android:title="@string/allow_rotation_title"
@ -52,4 +43,13 @@
android:persistent="true"
/>
<ListPreference
android:key="pref_override_icon_shape"
android:title="@string/icon_shape_override_label"
android:summary="%s"
android:entries="@array/icon_shape_override_paths_names"
android:entryValues="@array/icon_shape_override_paths_values"
android:defaultValue=""
android:persistent="false" />
</PreferenceScreen>