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

Commit 767743d6 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Revert "Update for 1.0.0-beta1"" into pi-dev

parents 4aff464a b4fe5234

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

+4 −4
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ import com.android.settingslib.utils.ThreadUtils; 
import java.util.Map;

import java.util.WeakHashMap;



import androidx.slice.Slice;

import androidx.slice.SliceProvider;

import androidx.slice.builders.SliceAction;

import androidx.slice.builders.ListBuilder;

import androidx.app.slice.Slice;

import androidx.app.slice.SliceProvider;

import androidx.app.slice.builders.SliceAction;

import androidx.app.slice.builders.ListBuilder;



/**

 * A {@link SliceProvider} for Settings to enabled inline results in system apps.

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

+4 −4
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ import com.android.settings.core.TogglePreferenceController; 
import com.android.settings.search.DatabaseIndexingUtils;

import com.android.settingslib.core.AbstractPreferenceController;



import androidx.slice.Slice;

import androidx.slice.builders.SliceAction;

import androidx.slice.builders.ListBuilder;

import androidx.slice.builders.ListBuilder.RowBuilder;

import androidx.app.slice.Slice;

import androidx.app.slice.builders.SliceAction;

import androidx.app.slice.builders.ListBuilder;

import androidx.app.slice.builders.ListBuilder.RowBuilder;



/**

 * Utility class to build Slices objects and Preference Controllers based on the Database managed

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.os.Binder; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns;



import androidx.slice.Slice;

import androidx.app.slice.Slice;



/**

 * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice.

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.robolectric.RuntimeEnvironment;



import androidx.slice.Slice;

import androidx.app.slice.Slice;



import java.util.HashMap;

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.robolectric.RuntimeEnvironment;



import androidx.slice.Slice;

import androidx.app.slice.Slice;



@RunWith(SettingsRobolectricTestRunner.class)

public class SliceBuilderUtilsTest {