Merge "Add global HTTP proxy to Privacy Settings page"

    <string name="enterprise_privacy_always_on_vpn_personal">Always-on VPN turned on in your personal profile</string>

    <!-- Label explaining that an always-on VPN was set by the admin in the work profile. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_always_on_vpn_work">Always-on VPN turned on in your work profile</string>

    <!-- Label explaining that a global HTTP proxy was set by the admin. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string>

    <!-- Preference label for the Photos & Videos storage section. [CHAR LIMIT=50] -->

    <string name="storage_photos_videos">Photos &amp; Videos</string>

                android:title="@string/enterprise_privacy_always_on_vpn_work"

                settings:allowDividerBelow="true"

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

    </PreferenceCategory>

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

     * Returns whether the Profile Owner in the managed profile (if any) set an always-on VPN.

     */

    boolean isAlwaysOnVpnSetInManagedProfile();

    /**

     * Returns whether the Device Owner set a recommended global HTTP proxy.

     */

    boolean isGlobalHttpProxySet();

}

        return managedProfileUserId != -1 &&

                VpnUtils.isAlwaysOnVpnSet(mCm, managedProfileUserId);

    }

    @Override

    public boolean isGlobalHttpProxySet() {

        return mCm.getGlobalProxy() != null;

    }

}

        controllers.add(new SecurityLogsPreferenceController(context));

        controllers.add(new AlwaysOnVpnPrimaryUserPreferenceController(context));

        controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context));

        controllers.add(new GlobalHttpProxyPreferenceController(context));

        return controllers;

    }