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

Merge "Add keys to all Preferences on the Managed device info page" into oc-dev am: 9e94d80fa5 am: 25f0d19504

Browse Source 
am: cb8242c21d

Change-Id: I22e48b8c79917f9d73c1d365cde5ab454d05ba62
This commit is contained in:
Bartosz Fabianowski
2017-06-08 07:03:11 +00:00
committed by android-build-merger
parent cc446060e5 cb8242c21d
commit f9bbd63106
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/xml/enterprise_privacy_settings.xml
View File

@@ -20,19 +20,23 @@
android:title="@string/enterprise_privacy_settings"> android:title="@string/enterprise_privacy_settings">
<!-- Header --> <!-- Header -->
<Preference <Preference android:key="enterprise_privacy_header"
android:icon="@drawable/ic_info_outline_24dp" android:icon="@drawable/ic_info_outline_24dp"
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:key="exposure_category"
android:title="@string/enterprise_privacy_exposure_category"
android:contentDescription="@string/enterprise_privacy_exposure_category"> android:contentDescription="@string/enterprise_privacy_exposure_category">
<Preference android:layout_height="wrap_content" <Preference android:key="enterprise_privacy_enterprise_data"
android:layout_height="wrap_content"
android:title="@string/enterprise_privacy_enterprise_data" android:title="@string/enterprise_privacy_enterprise_data"
android:selectable="false"/> android:selectable="false"/>
<Preference android:title="@string/enterprise_privacy_installed_packages" <Preference android:key="enterprise_privacy_installed_packages"
android:title="@string/enterprise_privacy_installed_packages"
android:selectable="false"/> android:selectable="false"/>
<Preference android:title="@string/enterprise_privacy_usage_stats" <Preference android:key="enterprise_privacy_usage_stats"
android:title="@string/enterprise_privacy_usage_stats"
android:selectable="false"/> android:selectable="false"/>
<Preference android:key="network_logs" <Preference android:key="network_logs"
android:title="@string/enterprise_privacy_network_logs" android:title="@string/enterprise_privacy_network_logs"
@@ -78,10 +82,13 @@
android:selectable="false"/> android:selectable="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_device_access_category"> <PreferenceCategory android:key="device_access_category"
<Preference android:title="@string/enterprise_privacy_lock_device" android:title="@string/enterprise_privacy_device_access_category">
<Preference android:key="enterprise_privacy_lock_device"
android:title="@string/enterprise_privacy_lock_device"
android:selectable="false"/> android:selectable="false"/>
<Preference android:title="@string/enterprise_privacy_wipe_device" <Preference android:key="enterprise_privacy_wipe_device"
android:title="@string/enterprise_privacy_wipe_device"
android:selectable="false"/> android:selectable="false"/>
<Preference android:key="failed_password_wipe_current_user" <Preference 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"