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

Replace the SwitchBar with MainSwitch.

Browse Source 
- Update wi-fi calling switch.
- Update the switches in Accessibility

Fix: 178673860
Fix: 177968565
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Id10e6a110f418ea500a2eaf3c54752bef4f36507
This commit is contained in:
Stanley Wang
2021-02-03 23:40:46 +08:00
parent a9f0903581
commit 86cc0579f3
19 changed files with 262 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
View File

@@ -27,7 +27,6 @@ import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -55,8 +54,7 @@ import com.android.settings.SettingsActivity;
import com.android.settings.network.ims.MockWifiCallingQueryImsState;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
import com.android.settings.widget.SettingsMainSwitchBar;
import org.junit.Before;
import org.junit.Test;
@@ -85,19 +83,28 @@ public class WifiCallingSettingsForSubTest {
private final PersistableBundle mBundle = new PersistableBundle();
private MockWifiCallingQueryImsState mQueryImsState;
private SettingsMainSwitchBar mSwitchBar;
@Mock private static CarrierConfigManager sCarrierConfigManager;
@Mock private CarrierConfigManager mMockConfigManager;
@Mock private ImsMmTelManager mImsMmTelManager;
@Mock private TelephonyManager mTelephonyManager;
@Mock private PreferenceScreen mPreferenceScreen;
@Mock private SettingsActivity mActivity;
@Mock private SwitchBar mSwitchBar;
@Mock private ToggleSwitch mToggleSwitch;
@Mock private View mView;
@Mock private ListWithEntrySummaryPreference mButtonWfcMode;
@Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
@Mock private Preference mUpdateAddress;
@Mock
private static CarrierConfigManager sCarrierConfigManager;
@Mock
private CarrierConfigManager mMockConfigManager;
@Mock
private ImsMmTelManager mImsMmTelManager;
@Mock
private TelephonyManager mTelephonyManager;
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock
private SettingsActivity mActivity;
@Mock
private View mView;
@Mock
private ListWithEntrySummaryPreference mButtonWfcMode;
@Mock
private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
@Mock
private Preference mUpdateAddress;
@Before
public void setUp() throws Exception {
@@ -125,7 +132,7 @@ public class WifiCallingSettingsForSubTest {
mEmptyView = new TextView(mContext);
doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);
ReflectionHelpers.setField(mSwitchBar, "mSwitch", mToggleSwitch);
mSwitchBar = new SettingsMainSwitchBar(mContext);
doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);
mQueryImsState = new MockWifiCallingQueryImsState(mContext, SUB_ID);
@@ -364,6 +371,7 @@ public class WifiCallingSettingsForSubTest {
}
@Override
void showAlert(Intent intent) {}
void showAlert(Intent intent) {
}
}
}