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

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

Merge "Remove android:visibility attributes from Preferences" into oc-dev 

am: b9f570ff

Change-Id: I14c2b9e37201e478e28fba96494bee807134b32c
parents 659c66a3 b9f570ff

res/xml/enterprise_privacy_settings.xml

+0 −14
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
        <com.android.settings.DividerPreference

                android:key="network_logs"

                android:title="@string/enterprise_privacy_network_logs"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="bug_reports"
@@ -48,7 +47,6 @@ 
        <com.android.settings.DividerPreference

                android:key="security_logs"

                android:title="@string/enterprise_privacy_security_logs"

                android:visibility="gone"

                settings:multiLine="true"/>

    </PreferenceCategory>
@@ -56,51 +54,41 @@ 
        <com.android.settings.DividerPreference

                android:key="number_enterprise_installed_packages"

                android:title="@string/enterprise_privacy_enterprise_installed_packages"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="enterprise_privacy_number_location_access_packages"

                android:title="@string/enterprise_privacy_location_access"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="enterprise_privacy_number_microphone_access_packages"

                android:title="@string/enterprise_privacy_microphone_access"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="enterprise_privacy_number_camera_access_packages"

                android:title="@string/enterprise_privacy_camera_access"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="number_enterprise_set_default_apps"

                android:title="@string/enterprise_privacy_enterprise_set_default_apps"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="always_on_vpn_primary_user"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="always_on_vpn_managed_profile"

                android:title="@string/enterprise_privacy_always_on_vpn_work"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="input_method"

                android:title="@string/enterprise_privacy_input_method"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="global_http_proxy"

                android:title="@string/enterprise_privacy_global_http_proxy"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="ca_certs"

                android:title="@string/enterprise_privacy_ca_certs"

                android:visibility="gone"

                settings:multiLine="true"/>

    </PreferenceCategory>
@@ -114,12 +102,10 @@ 
        <com.android.settings.DividerPreference

                android:key="failed_password_wipe_primary_user"

                android:title="@string/enterprise_privacy_failed_password_wipe_device"

                android:visibility="gone"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="failed_password_wipe_managed_profile"

                android:title="@string/enterprise_privacy_failed_password_wipe_work"

                android:visibility="gone"

                settings:multiLine="true"/>

    </PreferenceCategory>

</PreferenceScreen>