Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9bbd631 authored by Bartosz Fabianowski's avatar Bartosz Fabianowski Committed by android-build-merger
Browse files

Merge "Add keys to all Preferences on the Managed device info page" into... 

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

Change-Id: I22e48b8c79917f9d73c1d365cde5ab454d05ba62
parents cc446060 cb8242c2

res/xml/enterprise_privacy_settings.xml

+18 −11
Original line number Diff line number Diff line
@@ -20,19 +20,23 @@ 
                  android:title="@string/enterprise_privacy_settings">



    <!-- Header -->

    <Preference

    <Preference android:key="enterprise_privacy_header"

                android:icon="@drawable/ic_info_outline_24dp"

                android:summary="@string/enterprise_privacy_header"

                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">

        <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: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"/>

        <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"/>

        <Preference android:key="network_logs"

                    android:title="@string/enterprise_privacy_network_logs"
@@ -78,10 +82,13 @@ 
                    android:selectable="false"/>

    </PreferenceCategory>



    <PreferenceCategory android:title="@string/enterprise_privacy_device_access_category">

        <Preference android:title="@string/enterprise_privacy_lock_device"

    <PreferenceCategory android:key="device_access_category"

                        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"/>

        <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"/>

        <Preference android:key="failed_password_wipe_current_user"

                    android:title="@string/enterprise_privacy_failed_password_wipe_device"