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

Merge "Add flag to control Internet preference" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-09 08:22:57 +00:00
committed by Android (Google) Code Review
parent fa034b1b67 0e9c157c36
commit 0f33518068
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -387,6 +387,9 @@
<!-- Whether Wi-Fi hotspot speed should be shown or not. -->
<bool name="config_show_wifi_hotspot_speed">true</bool>
<!-- Whether or not Internet preference should be shown. -->
<bool name="config_show_internet_settings">true</bool>
<!-- Whether toggle_airplane is available or not. -->
<bool name="config_show_toggle_airplane">true</bool>

2
src/com/android/settings/network/InternetPreferenceController.java
View File

@@ -180,7 +180,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i
@Override
public boolean isAvailable() {
return true;
return mContext.getResources().getBoolean(R.bool.config_show_internet_settings);
}
@Override

6
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -295,6 +295,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
final Context context = getContext();
if (context != null && !context.getResources().getBoolean(
R.bool.config_show_internet_settings)) {
finish();
return;
}
mAirplaneModeEnabler = new AirplaneModeEnabler(getContext(), this);
// TODO(b/37429702): Add animations and preference comparator back after initial screen is

6
tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
View File

@@ -49,6 +49,7 @@ import androidx.test.annotation.UiThreadTest;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.R;
import com.android.settings.testutils.ResourcesUtils;
import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.settings.wifi.WifiSummaryUpdater;
@@ -188,8 +189,9 @@ public class InternetPreferenceControllerTest {
}
@Test
public void isAvailable_shouldBeTrue() {
assertThat(mController.isAvailable()).isTrue();
public void isAvailable_shouldMatchPrefFlag() {
assertThat(mController.isAvailable()).isEqualTo(
mContext.getResources().getBoolean(R.bool.config_show_internet_settings));
}
@Test