Merge "Dynamically return the uri of WifiSlice." (c37171f1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/slice/WifiSlice.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -93,8 +93,7 @@ public class WifiSlice implements CustomSliceable {
		final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,
		null /* actionTitle */, isWifiEnabled);

		final ListBuilder listBuilder = new ListBuilder(mContext, WIFI_SLICE_URI,
		ListBuilder.INFINITY)
		final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
		.setAccentColor(color)
		.addRow(new ListBuilder.RowBuilder()
		.setTitle(title)

+10 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import androidx.slice.core.SliceAction;
		import androidx.slice.widget.SliceLiveData;

		import com.android.settings.R;
		import com.android.settings.slices.CustomSliceRegistry;

		import org.junit.Before;
		import org.junit.Test;
		@@ -97,4 +98,13 @@ public class ContextualWifiSliceTest {
		R.drawable.ic_settings_wireless);
		assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedToggleIcon.toString());
		}

		@Test
		public void getWifiSlice_contextualWifiSlice_shouldReturnContextualWifiSliceUri() {
		mWifiSlice.mPreviouslyDisplayed = true;

		final Slice wifiSlice = mWifiSlice.getSlice();

		assertThat(wifiSlice.getUri()).isEqualTo(CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI);
		}
		}