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

Status header not clickable in DataUsageSummary

Browse Source 
Status header (DataUsageSummaryPreference) is not clickable in the
DataUsageSummary.

So remove the legacy logics, to unblock unified default template.

Bug: 234104784
Test: m RunSettingsRoboTests
Change-Id: I3dddf4ec3f84d53fd07afbb62d171942a6acce5d
This commit is contained in:
Chaohui Wang
2023-10-09 16:51:18 +08:00
parent 0bcf5b79f8
commit 51e1576c34
4 changed files with 5 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -36,11 +36,11 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
@@ -49,7 +49,7 @@ import java.util.List;
/**
* Settings preference fragment that displays data usage summary.
*/
public class DataUsageSummary extends DataUsageBaseFragment implements DataUsageEditController {
public class DataUsageSummary extends DashboardFragment {
private static final String TAG = "DataUsageSummary";
@@ -57,14 +57,9 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
private static final String KEY_STATUS_HEADER = "status_header";
// Mobile data keys
public static final String KEY_MOBILE_USAGE_TITLE = "mobile_category";
private DataUsageSummaryPreference mSummaryPreference;
private DataUsageSummaryPreferenceController mSummaryController;
private NetworkTemplate mDefaultTemplate;
private ProxySubscriptionManager mProxySubscriptionMgr;
@Override
@@ -100,8 +95,6 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
hasMobileData = false;
}
mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId);
mSummaryPreference = findPreference(KEY_STATUS_HEADER);
if (!hasMobileData || !UserManager.get(context).isAdminUser()) {
removePreference(KEY_RESTRICT_BACKGROUND);
@@ -126,15 +119,6 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
setHasOptionsMenu(true);
}
@Override
public boolean onPreferenceTreeClick(Preference preference) {
if (preference == findPreference(KEY_STATUS_HEADER)) {
BillingCycleSettings.BytesEditorFragment.show(this, false);
return false;
}
return super.onPreferenceTreeClick(preference);
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.data_usage;
@@ -153,9 +137,8 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
MobileNetworkUtils.isMobileNetworkUserRestricted(context)) {
return controllers;
}
mSummaryController =
new DataUsageSummaryPreferenceController(activity,
DataUsageUtils.getDefaultSubscriptionId(activity));
final var mSummaryController = new DataUsageSummaryPreferenceController(activity,
DataUsageUtils.getDefaultSubscriptionId(activity));
controllers.add(mSummaryController);
return controllers;
}
@@ -269,22 +252,6 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
return SettingsEnums.DATA_USAGE_SUMMARY;
}
@Override
public NetworkPolicyEditor getNetworkPolicyEditor() {
return services.mPolicyEditor;
}
@Override
public NetworkTemplate getNetworkTemplate() {
return mDefaultTemplate;
}
@Override
public void updateDataUsage() {
updateState();
mSummaryController.updateState(mSummaryPreference);
}
private static boolean isGuestUser(Context context) {
if (context == null) return false;
final UserManager userManager = context.getSystemService(UserManager.class);