Use MainSwitchPreference to replace the button style switches.
Fix: 177967926 Fix: 177968295 Fix: 177967925 Fix: 177968078 Test: Run robotest and apply the widget in Settings and see the ui Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
This commit is contained in:
@@ -22,24 +22,21 @@ import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
|
||||
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
|
||||
import static android.provider.Settings.Global.ZEN_MODE_OFF;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.NotificationManager;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.notification.zen.ZenModeBackend;
|
||||
import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.widget.MainSwitchPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -61,14 +58,10 @@ public class ZenModeButtonPreferenceControllerTest {
|
||||
@Mock
|
||||
private NotificationManager mNotificationManager;
|
||||
@Mock
|
||||
private Preference mockPref;
|
||||
private MainSwitchPreference mMockPref;
|
||||
@Mock
|
||||
private NotificationManager.Policy mPolicy;
|
||||
@Mock
|
||||
private Button mZenButtonOn;
|
||||
@Mock
|
||||
private Button mZenButtonOff;
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
private ContentResolver mContentResolver;
|
||||
private Context mContext;
|
||||
@@ -85,67 +78,65 @@ public class ZenModeButtonPreferenceControllerTest {
|
||||
mock(FragmentManager.class));
|
||||
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
|
||||
ReflectionHelpers.setField(mController, "mBackend", mBackend);
|
||||
ReflectionHelpers.setField(mController, "mZenButtonOn", mZenButtonOn);
|
||||
ReflectionHelpers.setField(mController, "mZenButtonOff", mZenButtonOff);
|
||||
|
||||
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
|
||||
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
|
||||
mMockPref);
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_TotalSilence() {
|
||||
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
|
||||
final Preference mockPref = mock(Preference.class);
|
||||
mController.updateState(mockPref);
|
||||
final MainSwitchPreference pref = new MainSwitchPreference(mContext);
|
||||
|
||||
verify(mZenButtonOn).setVisibility(View.GONE);
|
||||
verify(mZenButtonOff).setVisibility(View.VISIBLE);
|
||||
mController.updateState(pref);
|
||||
|
||||
assertThat(pref.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_AlarmsOnly() {
|
||||
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
|
||||
final Preference mockPref = mock(Preference.class);
|
||||
mController.updateState(mockPref);
|
||||
final MainSwitchPreference pref = new MainSwitchPreference(mContext);
|
||||
|
||||
verify(mZenButtonOn).setVisibility(View.GONE);
|
||||
verify(mZenButtonOff).setVisibility(View.VISIBLE);
|
||||
mController.updateState(pref);
|
||||
|
||||
assertThat(pref.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_Priority() {
|
||||
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
|
||||
final Preference mockPref = mock(Preference.class);
|
||||
mController.updateState(mockPref);
|
||||
final MainSwitchPreference pref = new MainSwitchPreference(mContext);
|
||||
|
||||
verify(mZenButtonOn).setVisibility(View.GONE);
|
||||
verify(mZenButtonOff).setVisibility(View.VISIBLE);
|
||||
mController.updateState(pref);
|
||||
|
||||
assertThat(pref.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_ZenOff() {
|
||||
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_OFF);
|
||||
final Preference mockPref = mock(Preference.class);
|
||||
mController.updateState(mockPref);
|
||||
final MainSwitchPreference pref = new MainSwitchPreference(mContext);
|
||||
|
||||
verify(mZenButtonOn).setVisibility(View.VISIBLE);
|
||||
verify(mZenButtonOff).setVisibility(View.GONE);
|
||||
mController.updateState(pref);
|
||||
|
||||
assertThat(pref.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_otherUserChangedZen() {
|
||||
final Preference mockPref = mock(Preference.class);
|
||||
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_OFF);
|
||||
mController.updateState(mockPref);
|
||||
verify(mZenButtonOn).setVisibility(View.VISIBLE);
|
||||
verify(mZenButtonOff).setVisibility(View.GONE);
|
||||
final MainSwitchPreference pref = new MainSwitchPreference(mContext);
|
||||
mController.updateState(pref);
|
||||
|
||||
assertThat(pref.isChecked()).isFalse();
|
||||
|
||||
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
|
||||
final int GUEST_USER_ID = 10;
|
||||
mController.mSettingObserver.onChange(false,
|
||||
Settings.Global.getUriFor(Settings.Global.ZEN_MODE), GUEST_USER_ID);
|
||||
|
||||
verify(mZenButtonOn).setVisibility(View.GONE);
|
||||
verify(mZenButtonOff).setVisibility(View.VISIBLE);
|
||||
assertThat(pref.isChecked()).isFalse();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user