Merge "Change order of Security and Privacy on Homepage" into sc-dev am: 5fd10eed56

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916856

Change-Id: I936c6fc6364a2074e1c7ddad71a225e722b79ea5
This commit is contained in:
Yanting Yang
2021-03-19 09:01:36 +00:00
committed by Automerger Merge Worker

View File

@@ -96,29 +96,29 @@
android:title="@string/accessibility_settings"
settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
<com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.security.SecuritySettings"
android:icon="@drawable/ic_homepage_security_v2"
android:key="top_level_security"
android:order="-50"
android:title="@string/security_settings_title"
settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
<com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
android:icon="@drawable/ic_homepage_privacy_v2"
android:key="top_level_privacy"
android:order="-50"
android:order="-40"
android:title="@string/privacy_dashboard_title"/>
<com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.location.LocationSettings"
android:icon="@drawable/ic_homepage_location_v2"
android:key="top_level_location"
android:order="-40"
android:order="-30"
android:title="@string/location_settings_title"
settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
<com.android.settings.homepage.HomepagePreference
android:fragment="com.android.settings.security.SecuritySettings"
android:icon="@drawable/ic_homepage_security_v2"
android:key="top_level_security"
android:order="-30"
android:title="@string/security_settings_title"
settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
<com.android.settings.homepage.HomepagePreference
android:key="top_level_emergency"
android:title="@string/emergency_settings_preference_title"