Merge "[Settings] Data roaming warning only when turn ON"

src/com/android/settings/network/telephony/RoamingPreferenceController.java

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

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

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