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

Merge "[Settings] enhancing data saver config control" into tm-qpr-dev am: 106fd86520

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419511

Change-Id: I5338c24812346b79068b1fee0c5ba98ff07eec33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2022-11-11 10:23:48 +00:00
committed by Automerger Merge Worker
parent 86e2948eb6 106fd86520
commit 56e5d50ca7
4 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/datausage/DataSaverSummary.java
View File

@@ -59,6 +59,11 @@ public class DataSaverSummary extends SettingsPreferenceFragment
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
if (!isDataSaverVisible(getContext())) {
finishFragment();
return;
}
addPreferencesFromResource(R.xml.data_saver);
mUnrestrictedAccess = findPreference(KEY_UNRESTRICTED_ACCESS);
mApplicationsState = ApplicationsState.getInstance(
@@ -192,12 +197,18 @@ public class DataSaverSummary extends SettingsPreferenceFragment
}
public static boolean isDataSaverVisible(Context context) {
return context.getResources()
.getBoolean(R.bool.config_show_data_saver);
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.data_saver) {
@Override
protected boolean isPageSearchEnabled(Context context) {
return DataUsageUtils.hasMobileData(context)
return isDataSaverVisible(context)
&& DataUsageUtils.hasMobileData(context)
&& DataUsageUtils.getDefaultSubscriptionId(context)
!= SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}