PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa am: fdd8331363

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd7dfb3f5e3bf0f26f1b6c525ffa80256b9227a4
This commit is contained in:
Tsung-Mao Fang
2021-02-01 15:19:40 +00:00
committed by Automerger Merge Worker
parent 9657379d70 fdd8331363
commit 0942bf2582
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/xml/credential_management_app_fragment.xml
View File

@@ -25,14 +25,18 @@
android:layout="@layout/settings_entity_header"
android:selectable="false"
android:order="-10000"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.security.CredentialManagementAppHeaderController"/>
<com.android.settingslib.widget.TopIntroPreference
android:key="top_intro_request_manage_credentials"
android:order="-9999"
android:title="@string/request_manage_credentials_description"/>
<!-- Buttons -->
<com.android.settingslib.widget.ActionButtonsPreference
android:key="buttons"
android:selectable="true"
android:order="-9999"
android:order="-9998"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.security.CredentialManagementAppButtonsController"/>
@@ -42,6 +46,7 @@
android:key="authentication_policy"
android:layout="@layout/preference_category_no_label"
android:title="@string/summary_placeholder"
settings:allowDividerAbove="true"
settings:controller="com.android.settings.security.CredentialManagementAppPolicyController"/>
</PreferenceScreen>