Fix "Automatically sync app data" button state not changed
This issue is caused by mPreference is null. (Not recovered when the fragment is recreated after configuration change.) Mimic the PreferenceDialogFragmentCompat.getPreference() in AndroidX to solve this issue. https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java;l=176;drc=ca9feb3b73769089afbfd36b4d4a3d91239f9cd5 Ideally in the long term, we could use PreferenceDialogFragmentCompat instead. Fix: 218754949 Test: robotest & manual Change-Id: I7fc8dd3b771aa45c91f915e25c8cc6c6afdd8d63
This commit is contained in:
@@ -19,6 +19,7 @@ package com.android.settings.testutils.shadow;
|
||||
import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
|
||||
|
||||
import android.accounts.Account;
|
||||
import android.annotation.UserIdInt;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.SyncAdapterType;
|
||||
import android.database.Cursor;
|
||||
@@ -76,8 +77,12 @@ public class ShadowContentResolver {
|
||||
|
||||
@Implementation
|
||||
protected static boolean getMasterSyncAutomaticallyAsUser(int userId) {
|
||||
return sMasterSyncAutomatically.containsKey(userId)
|
||||
? sMasterSyncAutomatically.get(userId) : true;
|
||||
return sMasterSyncAutomatically.getOrDefault(userId, true);
|
||||
}
|
||||
|
||||
@Implementation
|
||||
protected static void setMasterSyncAutomaticallyAsUser(boolean sync, @UserIdInt int userId) {
|
||||
sMasterSyncAutomatically.put(userId, sync);
|
||||
}
|
||||
|
||||
public static void setSyncAdapterTypes(SyncAdapterType[] syncAdapterTypes) {
|
||||
|
@@ -21,16 +21,20 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.testutils.shadow.ShadowContentResolver;
|
||||
import com.android.settings.users.AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -38,12 +42,14 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {ShadowContentResolver.class})
|
||||
public class AutoSyncDataPreferenceControllerTest {
|
||||
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
@@ -51,12 +57,11 @@ public class AutoSyncDataPreferenceControllerTest {
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private UserManager mUserManager;
|
||||
@Mock
|
||||
private Fragment mFragment;
|
||||
private PreferenceFragmentCompat mFragment;
|
||||
|
||||
private Preference mPreference;
|
||||
private SwitchPreference mPreference;
|
||||
private Context mContext;
|
||||
private AutoSyncDataPreferenceController mController;
|
||||
private AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment mConfirmSyncFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -65,11 +70,17 @@ public class AutoSyncDataPreferenceControllerTest {
|
||||
shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mController = new AutoSyncDataPreferenceController(mContext, mFragment);
|
||||
mConfirmSyncFragment = new AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment();
|
||||
mConfirmSyncFragment.setTargetFragment(mFragment, 0);
|
||||
mPreference = new Preference(mContext);
|
||||
mPreference.setKey(mController.getPreferenceKey());
|
||||
when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
|
||||
String preferenceKey = mController.getPreferenceKey();
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setKey(preferenceKey);
|
||||
mPreference.setChecked(true);
|
||||
when(mScreen.findPreference(preferenceKey)).thenReturn(mPreference);
|
||||
when(mFragment.findPreference(preferenceKey)).thenReturn(mPreference);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
ShadowContentResolver.reset();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -119,15 +130,26 @@ public class AutoSyncDataPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void autoSyncData_shouldNotBeSetOnCancel() {
|
||||
final Context context = RuntimeEnvironment.application;
|
||||
final SwitchPreference preference = new SwitchPreference(context);
|
||||
preference.setChecked(false);
|
||||
mController = new AutoSyncDataPreferenceController(context, mFragment);
|
||||
mConfirmSyncFragment.mPreference = preference;
|
||||
mConfirmSyncFragment.mEnabling = true;
|
||||
public void confirmDialog_uncheckThenOk_shouldUncheck() {
|
||||
ConfirmAutoSyncChangeFragment confirmSyncFragment =
|
||||
ConfirmAutoSyncChangeFragment.newInstance(false, 0, mController.getPreferenceKey());
|
||||
confirmSyncFragment.setTargetFragment(mFragment, 0);
|
||||
|
||||
mConfirmSyncFragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
|
||||
assertThat(preference.isChecked()).isFalse();
|
||||
confirmSyncFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
|
||||
|
||||
assertThat(ContentResolver.getMasterSyncAutomaticallyAsUser(0)).isFalse();
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void confirmDialog_uncheckThenCancel_shouldNotUncheck() {
|
||||
ConfirmAutoSyncChangeFragment confirmSyncFragment =
|
||||
ConfirmAutoSyncChangeFragment.newInstance(false, 0, mController.getPreferenceKey());
|
||||
confirmSyncFragment.setTargetFragment(mFragment, 0);
|
||||
|
||||
confirmSyncFragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
|
||||
|
||||
assertThat(ContentResolver.getMasterSyncAutomaticallyAsUser(0)).isTrue();
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
}
|
||||
|
@@ -25,8 +25,8 @@ import android.content.Context;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -49,7 +49,7 @@ public class AutoSyncPersonalDataPreferenceControllerTest {
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private UserManager mUserManager;
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private Fragment mFragment;
|
||||
private PreferenceFragmentCompat mFragment;
|
||||
|
||||
private Context mContext;
|
||||
private Preference mPreference;
|
||||
|
@@ -27,17 +27,17 @@ import android.content.pm.UserInfo;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class AutoSyncWorkDataPreferenceControllerTest {
|
||||
@@ -47,7 +47,7 @@ public class AutoSyncWorkDataPreferenceControllerTest {
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private UserManager mUserManager;
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private Fragment mFragment;
|
||||
private PreferenceFragmentCompat mFragment;
|
||||
@Mock
|
||||
private Context mContext;
|
||||
|
||||
|
Reference in New Issue
Block a user