Merge "Add "Your work policy info" entry in Privacy settings" into qt-dev am: 9a1c75c57a am: 8573d27d31

am: aa813f5618

Change-Id: I2a1cb8143c105d4a03c4bffc34ba7bedfa9a83f4
This commit is contained in:
Ivan Podogov
2019-06-17 06:03:09 -07:00
committed by android-build-merger
9 changed files with 392 additions and 15 deletions

View File

@@ -29,6 +29,14 @@
android:title="@string/summary_placeholder"
settings:controller="com.android.settings.privacy.PermissionBarChartPreferenceController"/>
<!-- Work Policy info -->
<Preference
android:key="work_policy_info"
android:title="@string/work_policy_privacy_settings"
android:summary="@string/work_policy_privacy_settings_summary"
settings:allowDividerAbove="true"
settings:controller="com.android.settings.privacy.WorkPolicyInfoPreferenceController"/>
<!-- Accessibility usage -->
<Preference
android:key="privacy_accessibility_usage"
@@ -106,4 +114,4 @@
settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
</com.android.settings.widget.MasterSwitchPreference>
</PreferenceScreen>
</PreferenceScreen>