Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev
This commit is contained in:
@@ -49,6 +49,7 @@ import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.slices.BlockingSlicePrefController;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
@@ -353,6 +354,16 @@ public class DashboardFragmentTest {
|
||||
assertThat(pref).isInstanceOf(SwitchPreference.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createPreference_isActivityTile_returnPreference() {
|
||||
final Preference pref = mTestFragment.createPreference(mActivityTile);
|
||||
|
||||
assertThat(pref).isInstanceOf(Preference.class);
|
||||
assertThat(pref).isNotInstanceOf(PrimarySwitchPreference.class);
|
||||
assertThat(pref).isNotInstanceOf(SwitchPreference.class);
|
||||
assertThat(pref.getWidgetLayoutResource()).isEqualTo(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createPreference_isActivityTileAndHasSwitch_returnPrimarySwitchPreference() {
|
||||
mActivityTile.getMetaData().putString(META_DATA_PREFERENCE_SWITCH_URI, "uri");
|
||||
@@ -363,7 +374,7 @@ public class DashboardFragmentTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void createPreference_isProviderTileWithPendingIntent_returnPreference() {
|
||||
public void createPreference_isProviderTileWithPendingIntent_returnPreferenceWithIcon() {
|
||||
final ProviderInfo providerInfo = new ProviderInfo();
|
||||
providerInfo.packageName = "pkg";
|
||||
providerInfo.name = "provider";
|
||||
@@ -380,6 +391,8 @@ public class DashboardFragmentTest {
|
||||
assertThat(pref).isInstanceOf(Preference.class);
|
||||
assertThat(pref).isNotInstanceOf(PrimarySwitchPreference.class);
|
||||
assertThat(pref).isNotInstanceOf(SwitchPreference.class);
|
||||
assertThat(pref.getWidgetLayoutResource())
|
||||
.isEqualTo(R.layout.preference_external_action_icon);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user