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

Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment.

Browse Source 
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
This commit is contained in:
Yu Chao
2023-08-01 07:47:48 +00:00
committed by Yu Chao (zhào-yò)
parent 3e25353a21
commit 68e466ff01
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -61,7 +61,7 @@ import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.settings.R; 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.overlay.FeatureFactory;
import com.android.settings.widget.GearPreference; import com.android.settings.widget.GearPreference;
import com.android.settings.widget.GearPreference.OnGearClickListener; 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 * Settings screen listing VPNs. Configured VPNs and networks managed by apps
* are shown in the same list. * are shown in the same list.
*/ */
public class VpnSettings extends RestrictedSettingsFragment implements public class VpnSettings extends RestrictedDashboardFragment implements
Handler.Callback, Preference.OnPreferenceClickListener { Handler.Callback, Preference.OnPreferenceClickListener {
private static final String LOG_TAG = "VpnSettings"; private static final String LOG_TAG = "VpnSettings";
private static final boolean DEBUG = Log.isLoggable(LOG_TAG, Log.DEBUG); private static final boolean DEBUG = Log.isLoggable(LOG_TAG, Log.DEBUG);
@@ -135,7 +135,6 @@ public class VpnSettings extends RestrictedSettingsFragment implements
mUnavailable = isUiRestricted(); mUnavailable = isUiRestricted();
setHasOptionsMenu(!mUnavailable); setHasOptionsMenu(!mUnavailable);
addPreferencesFromResource(R.xml.vpn_settings2);
mPreferenceScreen = getPreferenceScreen(); mPreferenceScreen = getPreferenceScreen();
} }
@@ -211,6 +210,16 @@ public class VpnSettings extends RestrictedSettingsFragment implements
mUpdater.sendEmptyMessage(RESCAN_MESSAGE); mUpdater.sendEmptyMessage(RESCAN_MESSAGE);
} }
@Override
protected int getPreferenceScreenResId() {
return R.xml.vpn_settings2;
}
@Override
protected String getLogTag() {
return LOG_TAG;
}
@Override @Override
public void onPause() { public void onPause() {
if (mUnavailable) { if (mUnavailable) {