Merge "Fix ordering on work profile" into udc-dev am: 509f94a8c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22233751 Change-Id: I69db41e74b87674893432c681e1aeac3b20540d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -22,9 +22,9 @@
|
|||||||
android:title="@string/account_dashboard_title"
|
android:title="@string/account_dashboard_title"
|
||||||
settings:keywords="@string/keywords_accounts">
|
settings:keywords="@string/keywords_accounts">
|
||||||
|
|
||||||
<com.android.settings.widget.WorkOnlyCategory
|
<PreferenceCategory
|
||||||
android:key="autofill_work_app_defaults"
|
android:key="default_service_category"
|
||||||
android:order="30"
|
android:order="10"
|
||||||
android:title="@string/default_autofill_app">
|
android:title="@string/default_autofill_app">
|
||||||
|
|
||||||
<com.android.settings.widget.GearPreference
|
<com.android.settings.widget.GearPreference
|
||||||
@@ -36,11 +36,11 @@
|
|||||||
android:name="for_work"
|
android:name="for_work"
|
||||||
android:value="true" />
|
android:value="true" />
|
||||||
</com.android.settings.widget.GearPreference>
|
</com.android.settings.widget.GearPreference>
|
||||||
</com.android.settings.widget.WorkOnlyCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="credman_category"
|
android:key="credman_category"
|
||||||
android:order="20"
|
android:order="50"
|
||||||
android:persistent="false"
|
android:persistent="false"
|
||||||
android:title="@string/credman_credentials"
|
android:title="@string/credman_credentials"
|
||||||
settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
|
settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
|
||||||
|
Reference in New Issue
Block a user