Merge "Implement work-profile infra in BasePreferenceController"

This commit is contained in:
Raff Tsai
2019-12-10 03:02:17 +00:00
committed by Android (Google) Code Review
13 changed files with 132 additions and 149 deletions

View File

@@ -68,8 +68,10 @@
<attr name="searchable" format="boolean" />
<!-- Classname of a PreferenceController corresponding to the preference -->
<attr name="controller" format="string" />
<!-- customized subtitle if it's an unavailable slice -->
<!-- Customized subtitle if it's an unavailable slice -->
<attr name="unavailableSliceSubtitle" format="string" />
<!-- Whether or not the preference is for work profile, by default it's false. -->
<attr name="forWork" format="boolean" />
</declare-styleable>
<declare-styleable name="PreferenceScreen">
@@ -112,10 +114,6 @@
<attr name="confirmDeviceCredentialsSideMargin" format="dimension" />
<attr name="confirmDeviceCredentialsTopMargin" format="dimension" />
<declare-styleable name="WorkPreference">
<attr name="forWork" format="boolean" />
</declare-styleable>
<declare-styleable name="VideoPreference">
<attr name="animation" format="reference" />
<attr name="preview" format="reference" />