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

Commit 68e466ff authored by Yu Chao's avatar Yu Chao Committed by Yu Chao (zhào-yò)
Browse files

Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment. 

This is required for adding an overlay vpn_settings2.xml for Tips
Button.

Test: VpnSettingsTest
Bug: 293213974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f9ca569249331a062e6f58a49bb0bb53aa69b3db)
Merged-In: I26531afe75215c9531c0122d2e86fd5d0da4d3db
Change-Id: I26531afe75215c9531c0122d2e86fd5d0da4d3db
parent 3e25353a

src/com/android/settings/vpn2/VpnSettings.java

+12 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import com.android.internal.net.LegacyVpnInfo; 
import com.android.internal.net.VpnConfig;

import com.android.internal.net.VpnProfile;

import com.android.settings.R;

import com.android.settings.RestrictedSettingsFragment;

import com.android.settings.dashboard.RestrictedDashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.GearPreference;

import com.android.settings.widget.GearPreference.OnGearClickListener;
@@ -80,7 +80,7 @@ import java.util.Set; 
 * Settings screen listing VPNs. Configured VPNs and networks managed by apps

 * are shown in the same list.

 */

public class VpnSettings extends RestrictedSettingsFragment implements

public class VpnSettings extends RestrictedDashboardFragment implements

        Handler.Callback, Preference.OnPreferenceClickListener {

    private static final String LOG_TAG = "VpnSettings";

    private static final boolean DEBUG = Log.isLoggable(LOG_TAG, Log.DEBUG);
@@ -135,7 +135,6 @@ public class VpnSettings extends RestrictedSettingsFragment implements 
        mUnavailable = isUiRestricted();

        setHasOptionsMenu(!mUnavailable);



        addPreferencesFromResource(R.xml.vpn_settings2);

        mPreferenceScreen = getPreferenceScreen();

    }
@@ -211,6 +210,16 @@ public class VpnSettings extends RestrictedSettingsFragment implements 
        mUpdater.sendEmptyMessage(RESCAN_MESSAGE);

    }



    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.vpn_settings2;

    }



    @Override

    protected String getLogTag() {

        return LOG_TAG;

    }



    @Override

    public void onPause() {

        if (mUnavailable) {