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

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

Browse Source
This commit is contained in:
Alan Viverette
2018-03-15 20:04:22 +00:00
committed by Android (Google) Code Review
parent 4aff464a39 b4fe52343c
commit 767743d64d
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -34,10 +34,10 @@ import com.android.settingslib.utils.ThreadUtils;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import androidx.slice.Slice; import androidx.app.slice.Slice;
import androidx.slice.SliceProvider; import androidx.app.slice.SliceProvider;
import androidx.slice.builders.SliceAction; import androidx.app.slice.builders.SliceAction;
import androidx.slice.builders.ListBuilder; import androidx.app.slice.builders.ListBuilder;
/** /**
* A {@link SliceProvider} for Settings to enabled inline results in system apps. * A {@link SliceProvider} for Settings to enabled inline results in system apps.

8
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -35,10 +35,10 @@ import com.android.settings.core.TogglePreferenceController;
import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import androidx.slice.Slice; import androidx.app.slice.Slice;
import androidx.slice.builders.SliceAction; import androidx.app.slice.builders.SliceAction;
import androidx.slice.builders.ListBuilder; import androidx.app.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder; import androidx.app.slice.builders.ListBuilder.RowBuilder;
/** /**
* Utility class to build Slices objects and Preference Controllers based on the Database managed * Utility class to build Slices objects and Preference Controllers based on the Database managed

2
src/com/android/settings/slices/SlicesDatabaseAccessor.java
View File

@@ -28,7 +28,7 @@ import android.os.Binder;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; 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. * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice.

2
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -39,7 +39,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import androidx.slice.Slice; import androidx.app.slice.Slice;
import java.util.HashMap; import java.util.HashMap;

2
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -35,7 +35,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import androidx.slice.Slice; import androidx.app.slice.Slice;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class SliceBuilderUtilsTest { public class SliceBuilderUtilsTest {