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

Update slice constant reference

Browse Source 
Test: build
Bug: 73123786
Change-Id: I9f38f0298bcaace85256639fd285d38a580c90fe
This commit is contained in:
Jason Monk
2018-04-10 09:04:53 -04:00
parent 09793d19d3
commit 9b555bf515
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/slices/SliceBroadcastReceiver.java
View File

@@ -40,8 +40,6 @@ import com.android.settings.core.SliderPreferenceController;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import androidx.slice.core.SliceHints;
/** /**
* Responds to actions performed on slices and notifies slices of updates in state changes. * Responds to actions performed on slices and notifies slices of updates in state changes.
*/ */
@@ -64,7 +62,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
handleToggleAction(context, key, isPlatformDefined); handleToggleAction(context, key, isPlatformDefined);
break; break;
case ACTION_SLIDER_CHANGED: case ACTION_SLIDER_CHANGED:
int newPosition = intent.getIntExtra(SliceHints.EXTRA_RANGE_VALUE, -1); int newPosition = intent.getIntExtra(Slice.EXTRA_RANGE_VALUE, -1);
handleSliderAction(context, key, newPosition); handleSliderAction(context, key, newPosition);
break; break;
case ACTION_WIFI_CHANGED: case ACTION_WIFI_CHANGED:

9
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
View File

@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.app.slice.Slice;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -44,8 +45,6 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import androidx.slice.core.SliceHints;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class SliceBroadcastReceiverTest { public class SliceBroadcastReceiverTest {
@@ -129,7 +128,7 @@ public class SliceBroadcastReceiverTest {
fakeSliderController.setSliderPosition(oldPosition); fakeSliderController.setSliderPosition(oldPosition);
// Build action // Build action
Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED); Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, position); intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key); intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition); assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
@@ -163,7 +162,7 @@ public class SliceBroadcastReceiverTest {
// Build action // Build action
Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED); Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, position); intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key); intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
// Trigger the exception. // Trigger the exception.
@@ -174,7 +173,7 @@ public class SliceBroadcastReceiverTest {
public void sliderOnReceive_noKey_throwsException() { public void sliderOnReceive_noKey_throwsException() {
// Build action // Build action
final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED) final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
.putExtra(SliceHints.EXTRA_RANGE_VALUE, 0); .putExtra(Slice.EXTRA_RANGE_VALUE, 0);
// Trigger the exception. // Trigger the exception.
mReceiver.onReceive(mContext, intent); mReceiver.onReceive(mContext, intent);