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

Update layout and strings for DO Disclosures

Browse Source 
This CL updates the DO Disclosures page (aka "Enterprise Privacy")
to incorporate UI layout and string changes proposed since
implementation began. There are no logic changes.

Test: make RunSettingsRoboTests
Bug: 32692748

Change-Id: I6ae972e77bd90eb9c61d6a516046a6eb09981ad3
This commit is contained in:
Bartosz Fabianowski
2017-03-08 14:01:26 +01:00
parent 732d695985
commit 1a8399ffd0
34 changed files with 235 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
res/xml/enterprise_privacy_settings.xml
View File

@@ -19,91 +19,75 @@
android:key="enterprise_privacy_settings"
android:title="@string/enterprise_privacy_settings_title">
<!-- Header -->
<Preference android:key="enterprise_privacy_header"
android:summary="@string/enterprise_privacy_header"
android:selectable="false"/>
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_category">
<com.android.settings.DividerPreference
android:key="enterprise_data"
android:layout_height="wrap_content"
android:title="@string/enterprise_privacy_enterprise_data"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="number_installed_packages"
android:title="@string/enterprise_privacy_number_installed_packages_default"
settings:allowDividerBelow="true"
android:key="installed_packages"
android:title="@string/enterprise_privacy_installed_packages"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="usage_stats"
android:title="@string/enterprise_privacy_usage_stats"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="network_logs"
android:title="@string/enterprise_privacy_network_logs"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="bug_reports"
android:title="@string/enterprise_privacy_bug_reports"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="security_logs"
android:title="@string/enterprise_privacy_security_logs"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
<com.android.settings.DividerPreference
android:key="number_enterprise_installed_packages"
settings:allowDividerBelow="true"
android:title="@string/enterprise_privacy_enterprise_installed_packages"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="enterprise_privacy_number_location_access_packages"
settings:allowDividerBelow="true"
android:title="@string/enterprise_privacy_location_access"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="enterprise_privacy_number_microphone_access_packages"
settings:allowDividerBelow="true"
android:title="@string/enterprise_privacy_microphone_access"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="enterprise_privacy_number_camera_access_packages"
settings:allowDividerBelow="true"
android:title="@string/enterprise_privacy_camera_access"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="number_enterprise_set_default_apps"
settings:allowDividerBelow="true"
android:title="@string/enterprise_privacy_enterprise_set_default_apps"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="always_on_vpn_primary_user"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="always_on_vpn_managed_profile"
android:title="@string/enterprise_privacy_always_on_vpn_work"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="input_method"
settings:allowDividerBelow="true"
android:title="@string/enterprise_privacy_input_method"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="global_http_proxy"
android:title="@string/enterprise_privacy_global_http_proxy"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="ca_certs_current_user"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="ca_certs_managed_profile"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
</PreferenceCategory>
@@ -111,20 +95,20 @@
<com.android.settings.DividerPreference
android:key="lock_device"
android:title="@string/enterprise_privacy_lock_device"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="wipe_device"
android:title="@string/enterprise_privacy_wipe_device"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="failed_password_wipe_primary_user"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="failed_password_wipe_managed_profile"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
</PreferenceCategory>
<com.android.settings.widget.FooterPreference
android:title="@string/enterprise_privacy_footer"
android:selectable="false"/>
</PreferenceScreen>

6
res/xml/security_settings_misc.xml
View File

@@ -43,6 +43,12 @@
android:persistent="false"
android:fragment="com.android.settings.DeviceAdminSettings"/>
<Preference android:key="enterprise_privacy"
android:title="@string/enterprise_privacy_settings"
android:summary="@string/enterprise_privacy_settings_summary"
android:persistent="false"
android:fragment="com.android.settings.enterprise.EnterprisePrivacySettings"/>
</PreferenceCategory>
<Preference android:key="sim_lock_settings"