Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a974c63 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Update slice constant reference" into pi-dev

parents 34a593db 9b555bf5

src/com/android/settings/slices/SliceBroadcastReceiver.java

+1 −3
Original line number Diff line number Diff line
@@ -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:

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

+4 −5
Original line number Diff line number Diff line
@@ -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);