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

Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6

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

Change-Id: I9e2af4dda890ab5b13aa049430161eab1d602df3
This commit is contained in:
Bonian Chen
2020-08-05 06:11:11 +00:00
committed by Automerger Merge Worker
parent 1e328285b7 622da45ee6
commit 05b07f424e
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/network/telephony/RoamingPreferenceController.java
View File

@@ -22,7 +22,6 @@ import android.provider.Settings;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -110,21 +109,11 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
: AVAILABLE_UNSEARCHABLE; : AVAILABLE_UNSEARCHABLE;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
if (isDialogNeeded()) {
showDialog();
}
return true;
}
return false;
}
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
if (!isDialogNeeded()) { if (isDialogNeeded()) {
showDialog();
} else {
// Update data directly if we don't need dialog // Update data directly if we don't need dialog
mTelephonyManager.setDataRoamingEnabled(isChecked); mTelephonyManager.setDataRoamingEnabled(isChecked);
return true; return true;

4
tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
View File

@@ -117,10 +117,10 @@ public class RoamingPreferenceControllerTest {
} }
@Test @Test
public void handlePreferenceTreeClick_needDialog_showDialog() { public void setChecked_needDialog_showDialog() {
doReturn(true).when(mController).isDialogNeeded(); doReturn(true).when(mController).isDialogNeeded();
mController.handlePreferenceTreeClick(mPreference); mController.setChecked(true);
verify(mFragmentManager).beginTransaction(); verify(mFragmentManager).beginTransaction();
} }