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

Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev

Browse Source
This commit is contained in:
SongFerng Wang
2023-09-05 01:55:45 +00:00
committed by Android (Google) Code Review
parent a5027a20ff 8007efdbff
commit 60afc1259f
2 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
View File

@@ -45,11 +45,14 @@ import androidx.preference.PreferenceGroup;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Settings.DataUsageSummaryActivity;
import com.android.settings.Settings.TetherSettingsActivity;
import com.android.settings.Settings.WifiTetherSettingsActivity;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.gestures.OneHandedSettingsUtils;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wifi.WifiUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -204,12 +207,24 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
Log.d(TAG, "Skipping non-system app: " + info.activityInfo);
continue;
}
if (info.activityInfo.name.endsWith(DataUsageSummaryActivity.class.getSimpleName())) {
if (!canShowDataUsage()) {
Log.d(TAG, "Skipping data usage settings:" + info.activityInfo);
continue;
}
}
shortcuts.add(info);
}
Collections.sort(shortcuts, SHORTCUT_COMPARATOR);
return shortcuts;
}
@VisibleForTesting
boolean canShowDataUsage() {
return SubscriptionUtil.isSimHardwareVisible(mContext)
&& !MobileNetworkUtils.isMobileNetworkUserRestricted(mContext);
}
@VisibleForTesting
boolean canShowWifiHotspot() {
return WifiUtils.canShowWifiHotspot(mContext);