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

Merge "Fix a11y issues on the DO Disclosures page" into oc-dev

Browse Source 
am: 1871806fbe

Change-Id: I23a370dca49f5351e5ea4448386840bbc1ef81a3
This commit is contained in:
Bartosz Fabianowski
2017-04-28 15:25:44 +00:00
committed by android-build-merger
parent bb542f0894 1871806fbe
commit 5c5b801371
1 changed files with 57 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
res/xml/enterprise_privacy_settings.xml
View File

@@ -25,72 +25,68 @@
android:summary="@string/enterprise_privacy_header" android:summary="@string/enterprise_privacy_header"
android:selectable="false"/> android:selectable="false"/>
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_category"> <PreferenceCategory android:title="@string/enterprise_privacy_exposure_category"
<com.android.settings.DividerPreference android:contentDescription="@string/enterprise_privacy_exposure_category">
android:layout_height="wrap_content" <Preference android:layout_height="wrap_content"
android:title="@string/enterprise_privacy_enterprise_data"/> android:title="@string/enterprise_privacy_enterprise_data"
<com.android.settings.DividerPreference android:selectable="false"/>
android:title="@string/enterprise_privacy_installed_packages"/> <Preference android:title="@string/enterprise_privacy_installed_packages"
<com.android.settings.DividerPreference android:selectable="false"/>
android:title="@string/enterprise_privacy_usage_stats"/> <Preference android:title="@string/enterprise_privacy_usage_stats"
<com.android.settings.DividerPreference android:selectable="false"/>
android:key="network_logs" <Preference android:key="network_logs"
android:title="@string/enterprise_privacy_network_logs"/> android:title="@string/enterprise_privacy_network_logs"
<com.android.settings.DividerPreference android:selectable="false"/>
android:key="bug_reports" <Preference android:key="bug_reports"
android:title="@string/enterprise_privacy_bug_reports"/> android:title="@string/enterprise_privacy_bug_reports"
<com.android.settings.DividerPreference android:selectable="false"/>
android:key="security_logs" <Preference android:key="security_logs"
android:title="@string/enterprise_privacy_security_logs"/> android:title="@string/enterprise_privacy_security_logs"
android:selectable="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category"> <PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
<com.android.settings.DividerPreference <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages"
android:fragment="com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages" android:key="number_enterprise_installed_packages"
android:key="number_enterprise_installed_packages" android:title="@string/enterprise_privacy_enterprise_installed_packages"/>
android:title="@string/enterprise_privacy_enterprise_installed_packages"/> <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation"
<com.android.settings.DividerPreference android:key="enterprise_privacy_number_location_access_packages"
android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation" android:title="@string/enterprise_privacy_location_access"/>
android:key="enterprise_privacy_number_location_access_packages" <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone"
android:title="@string/enterprise_privacy_location_access"/> android:key="enterprise_privacy_number_microphone_access_packages"
<com.android.settings.DividerPreference android:title="@string/enterprise_privacy_microphone_access"/>
android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone" <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera"
android:key="enterprise_privacy_number_microphone_access_packages" android:key="enterprise_privacy_number_camera_access_packages"
android:title="@string/enterprise_privacy_microphone_access"/> android:title="@string/enterprise_privacy_camera_access"/>
<com.android.settings.DividerPreference <Preference android:fragment="com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment"
android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera" android:key="number_enterprise_set_default_apps"
android:key="enterprise_privacy_number_camera_access_packages" android:title="@string/enterprise_privacy_enterprise_set_default_apps"/>
android:title="@string/enterprise_privacy_camera_access"/> <Preference android:key="always_on_vpn_primary_user"
<com.android.settings.DividerPreference android:selectable="false"/>
android:fragment="com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment" <Preference android:key="always_on_vpn_managed_profile"
android:key="number_enterprise_set_default_apps" android:title="@string/enterprise_privacy_always_on_vpn_work"
android:title="@string/enterprise_privacy_enterprise_set_default_apps"/> android:selectable="false"/>
<com.android.settings.DividerPreference <Preference android:key="input_method"
android:key="always_on_vpn_primary_user"/> android:title="@string/enterprise_privacy_input_method"
<com.android.settings.DividerPreference android:selectable="false"/>
android:key="always_on_vpn_managed_profile" <Preference android:key="global_http_proxy"
android:title="@string/enterprise_privacy_always_on_vpn_work"/> android:title="@string/enterprise_privacy_global_http_proxy"
<com.android.settings.DividerPreference android:selectable="false"/>
android:key="input_method" <Preference android:key="ca_certs"
android:title="@string/enterprise_privacy_input_method"/> android:title="@string/enterprise_privacy_ca_certs"
<com.android.settings.DividerPreference android:selectable="false"/>
android:key="global_http_proxy"
android:title="@string/enterprise_privacy_global_http_proxy"/>
<com.android.settings.DividerPreference
android:key="ca_certs"
android:title="@string/enterprise_privacy_ca_certs"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_device_access_category"> <PreferenceCategory android:title="@string/enterprise_privacy_device_access_category">
<com.android.settings.DividerPreference <Preference android:title="@string/enterprise_privacy_lock_device"
android:title="@string/enterprise_privacy_lock_device"/> android:selectable="false"/>
<com.android.settings.DividerPreference <Preference android:title="@string/enterprise_privacy_wipe_device"
android:title="@string/enterprise_privacy_wipe_device"/> android:selectable="false"/>
<com.android.settings.DividerPreference <Preference android:key="failed_password_wipe_current_user"
android:key="failed_password_wipe_current_user" android:title="@string/enterprise_privacy_failed_password_wipe_device"
android:title="@string/enterprise_privacy_failed_password_wipe_device"/> android:selectable="false"/>
<com.android.settings.DividerPreference <Preference android:key="failed_password_wipe_managed_profile"
android:key="failed_password_wipe_managed_profile" android:title="@string/enterprise_privacy_failed_password_wipe_work"
android:title="@string/enterprise_privacy_failed_password_wipe_work"/> android:selectable="false"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>