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

Merge "[Settings] Support master switch of inline toggle of Settings Injection v2"

Browse Source
This commit is contained in:
Jason Chiu
2019-11-25 02:36:09 +00:00
committed by Android (Google) Code Review
parent a6e7aa1237 10e675d6b5
commit bfbb0181a3
5 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -48,6 +48,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.slices.BlockingSlicePrefController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -323,6 +324,15 @@ public class DashboardFragmentTest {
assertThat(pref).isInstanceOf(SwitchPreference.class);
}
@Test
public void createPreference_isActivityTileAndHasSwitch_returnMasterSwitchPreference() {
mActivityTile.getMetaData().putString(META_DATA_PREFERENCE_SWITCH_URI, "uri");
final Preference pref = mTestFragment.createPreference(mActivityTile);
assertThat(pref).isInstanceOf(MasterSwitchPreference.class);
}
private static class TestPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {

2
tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java
View File

@@ -58,7 +58,7 @@ public class ShadowTileUtils {
}
@Implementation
public static Bundle putBooleanToUri(Context context, Uri uri,
public static Bundle putBooleanToUriAndGetResult(Context context, Uri uri,
Map<String, IContentProvider> providerMap, String key, boolean value) {
sChecked = value;
return sResult;