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

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

Browse Source 
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
parent ad363b091f aa813f5618
commit e142b7ee3f
9 changed files with 392 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -414,4 +414,7 @@
<!-- List containing the injected tile keys which are suppressed. -->
<string-array name="config_suppress_injected_tile_keys" translatable="false"/>
<!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. -->
<string name="config_work_policy_info_intent_action" translatable="false"/>
</resources>

6
res/values/strings.xml
View File

@@ -11318,4 +11318,10 @@
<!-- Title for enable MMS notification channel. [CHAR LIMIT=40] -->
<string name="dual_cdma_sim_warning_notification_channel_title">SIM combination</string>
<!-- Title of setting on privacy settings screen that will show work policy info. [CHAR LIMIT=NONE] -->
<string name="work_policy_privacy_settings">Your work policy info</string>
<!-- Summary for Enterprise Privacy settings, explaining what the user can expect to find under it [CHAR LIMIT=NONE]-->
<string name="work_policy_privacy_settings_summary">Settings managed by your IT admin</string>
</resources>

10
res/xml/privacy_dashboard_settings.xml
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>