diff options
author | Raff Tsai <rafftsai@google.com> | 2019-11-07 18:10:14 +0800 |
---|---|---|
committer | Raff Tsai <rafftsai@google.com> | 2019-11-07 18:12:34 +0800 |
commit | 4992919d95c65c849825d7252c4ebd0b69b7c1b6 (patch) | |
tree | 3120f49463cd6762dce2120149df31ae3525ca51 /src/com/android/settings/datausage | |
parent | efcfbaeb5a9224c219ec8a964931d1d7106ee31a (diff) | |
download | packages_apps_Settings-4992919d95c65c849825d7252c4ebd0b69b7c1b6.tar.gz packages_apps_Settings-4992919d95c65c849825d7252c4ebd0b69b7c1b6.tar.bz2 packages_apps_Settings-4992919d95c65c849825d7252c4ebd0b69b7c1b6.zip |
Remove unused resources
Bug: 123794771
Test: rebuild, robolectric
Change-Id: I22f43220cc9ad4ec2074af425b0da75f59e470a4
Diffstat (limited to 'src/com/android/settings/datausage')
-rw-r--r-- | src/com/android/settings/datausage/CellDataPreference.java | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index af7e16e221..5bfe967ff0 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -39,7 +39,6 @@ import androidx.core.content.res.TypedArrayUtils; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.Utils; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.CustomDialogPreferenceCompat; @@ -141,36 +140,13 @@ public class CellDataPreference extends CustomDialogPreferenceCompat implements mSubId); final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo(); if (mChecked) { - // If the device is single SIM or is enabling data on the active data SIM then forgo - // the pop-up. - if (!Utils.showSimCardTile(getContext()) || - (nextSir != null && currentSir != null && - currentSir.getSubscriptionId() == nextSir.getSubscriptionId())) { - setMobileDataEnabled(false); - if (nextSir != null && currentSir != null && - currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) { - disableDataForOtherSubscriptions(mSubId); - } - return; + setMobileDataEnabled(false); + if (nextSir != null && currentSir != null + && currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) { + disableDataForOtherSubscriptions(mSubId); } - // disabling data; show confirmation dialog which eventually - // calls setMobileDataEnabled() once user confirms. - mMultiSimDialog = false; - super.performClick(view); } else { - // If we are showing the Sim Card tile then we are a Multi-Sim device. - if (Utils.showSimCardTile(getContext())) { - mMultiSimDialog = true; - if (nextSir != null && currentSir != null && - currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) { - setMobileDataEnabled(true); - disableDataForOtherSubscriptions(mSubId); - return; - } - super.performClick(view); - } else { - setMobileDataEnabled(true); - } + setMobileDataEnabled(true); } } |