OSDN Git Service

Update slice constant reference
authorJason Monk <jmonk@google.com>
Tue, 10 Apr 2018 13:04:53 +0000 (09:04 -0400)
committerJason Monk <jmonk@google.com>
Tue, 10 Apr 2018 14:56:32 +0000 (10:56 -0400)
Test: build
Bug: 73123786
Change-Id: I9f38f0298bcaace85256639fd285d38a580c90fe

src/com/android/settings/slices/SliceBroadcastReceiver.java
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java

index 2d6f83e..80b7519 100644 (file)
@@ -40,8 +40,6 @@ import com.android.settings.core.SliderPreferenceController;
 import com.android.settings.core.TogglePreferenceController;
 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.
  */
@@ -64,7 +62,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
                 handleToggleAction(context, key, isPlatformDefined);
                 break;
             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);
                 break;
             case ACTION_WIFI_CHANGED:
index fdd77e8..0cdb2f4 100644 (file)
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
+import android.app.slice.Slice;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -44,8 +45,6 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.robolectric.RuntimeEnvironment;
 
-import androidx.slice.core.SliceHints;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class SliceBroadcastReceiverTest {
 
@@ -129,7 +128,7 @@ public class SliceBroadcastReceiverTest {
         fakeSliderController.setSliderPosition(oldPosition);
         // Build action
         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);
 
         assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
@@ -163,7 +162,7 @@ public class SliceBroadcastReceiverTest {
 
         // Build action
         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);
 
         // Trigger the exception.
@@ -174,7 +173,7 @@ public class SliceBroadcastReceiverTest {
     public void sliderOnReceive_noKey_throwsException() {
         // Build action
         final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
-                .putExtra(SliceHints.EXTRA_RANGE_VALUE, 0);
+                .putExtra(Slice.EXTRA_RANGE_VALUE, 0);
 
         // Trigger the exception.
         mReceiver.onReceive(mContext, intent);