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

Remove "platform_slice" attribute from Settings.

Browse Source 
Bug: 126222433
Test: robo
Change-Id: I05beec7d3e3ec713c40740a1adbcacaee88237b5
This commit is contained in:
Fan Zhang
2019-05-31 17:01:52 -07:00
parent aa08a2cc0e
commit 13cf250be5
23 changed files with 86 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ import java.util.stream.Collectors;
* return an stub {@link Slice} with the correct {@link Uri} immediately. In the background, the
* data corresponding to the key in the {@link Uri} is read by {@link SlicesDatabaseAccessor}, and
* the entire row is converted into a {@link SliceData}. Once complete, it is stored in
* {@link #mSliceDataCache}, and then an update sent via the Slice framework to the Slice.
* {@link #mSliceWeakDataCache}, and then an update sent via the Slice framework to the Slice.
* The {@link Slice} displayed by the Slice-presenter will re-query this Slice-provider and find
* the {@link SliceData} cached to build the full {@link Slice}.
*
@@ -112,13 +112,6 @@ public class SettingsSliceProvider extends SliceProvider {
*/
public static final String EXTRA_SLICE_KEY = "com.android.settings.slice.extra.key";
/**
* Boolean extra to indicate if the Slice is platform-defined.
*/
public static final String EXTRA_SLICE_PLATFORM_DEFINED =
"com.android.settings.slice.extra.platform";
/**
* A list of custom slice uris that are supported publicly. This is a subset of slices defined
* in {@link CustomSliceRegistry}. Things here are exposed publicly so all clients with proper

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

@@ -23,7 +23,6 @@ import static com.android.settings.slices.SettingsSliceProvider.ACTION_COPY;
import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED;
import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED;
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED;
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY;
@@ -32,11 +31,9 @@ import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WI
import android.app.settings.SettingsEnums;
import android.app.slice.Slice;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
import android.util.Log;
@@ -58,8 +55,6 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
final String key = intent.getStringExtra(EXTRA_SLICE_KEY);
final boolean isPlatformSlice = intent.getBooleanExtra(EXTRA_SLICE_PLATFORM_DEFINED,
false /* default */);
if (CustomSliceRegistry.isValidAction(action)) {
final CustomSliceable sliceable =
@@ -68,15 +63,16 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
sliceable.onNotifyChange(intent);
return;
}
final Uri sliceUri = intent.getData();
switch (action) {
case ACTION_TOGGLE_CHANGED:
final boolean isChecked = intent.getBooleanExtra(Slice.EXTRA_TOGGLE_STATE, false);
handleToggleAction(context, key, isChecked, isPlatformSlice);
handleToggleAction(context, sliceUri, key, isChecked);
break;
case ACTION_SLIDER_CHANGED:
final int newPosition = intent.getIntExtra(Slice.EXTRA_RANGE_VALUE, -1);
handleSliderAction(context, key, newPosition, isPlatformSlice);
handleSliderAction(context, sliceUri, key, newPosition);
break;
case ACTION_BLUETOOTH_SLICE_CHANGED:
BluetoothSliceBuilder.handleUriChange(context, intent);
@@ -105,13 +101,12 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
.handleWifiCallingPreferenceChanged(intent);
break;
case ACTION_COPY:
handleCopyAction(context, key, isPlatformSlice);
handleCopyAction(context, sliceUri, key);
break;
}
}
private void handleToggleAction(Context context, String key, boolean isChecked,
boolean isPlatformSlice) {
private void handleToggleAction(Context context, Uri sliceUri, String key, boolean isChecked) {
if (TextUtils.isEmpty(key)) {
throw new IllegalStateException("No key passed to Intent for toggle controller");
}
@@ -125,7 +120,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
if (!controller.isAvailable()) {
Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
if (!controller.hasAsyncUpdate()) {
updateUri(context, key, isPlatformSlice);
context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
return;
}
@@ -136,12 +131,11 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
toggleController.setChecked(isChecked);
logSliceValueChange(context, key, isChecked ? 1 : 0);
if (!controller.hasAsyncUpdate()) {
updateUri(context, key, isPlatformSlice);
context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
}
private void handleSliderAction(Context context, String key, int newPosition,
boolean isPlatformSlice) {
private void handleSliderAction(Context context, Uri sliceUri, String key, int newPosition) {
if (TextUtils.isEmpty(key)) {
throw new IllegalArgumentException(
"No key passed to Intent for slider controller. Use extra: " + EXTRA_SLICE_KEY);
@@ -159,7 +153,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
if (!controller.isAvailable()) {
Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
updateUri(context, key, isPlatformSlice);
context.getContentResolver().notifyChange(sliceUri, null /* observer */);
return;
}
@@ -174,10 +168,10 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
sliderController.setSliderPosition(newPosition);
logSliceValueChange(context, key, newPosition);
updateUri(context, key, isPlatformSlice);
context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
private void handleCopyAction(Context context, String key, boolean isPlatformSlice) {
private void handleCopyAction(Context context, Uri sliceUri, String key) {
if (TextUtils.isEmpty(key)) {
throw new IllegalArgumentException("No key passed to Intent for controller");
}
@@ -192,7 +186,7 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
if (!controller.isAvailable()) {
Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
if (!controller.hasAsyncUpdate()) {
updateUri(context, key, isPlatformSlice);
context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
return;
}
@@ -217,17 +211,4 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
final SliceData sliceData = accessor.getSliceDataFromKey(key);
return SliceBuilderUtils.getPreferenceController(context, sliceData);
}
private void updateUri(Context context, String key, boolean isPlatformDefined) {
final String authority = isPlatformDefined
? SettingsSlicesContract.AUTHORITY
: SettingsSliceProvider.SLICE_AUTHORITY;
final Uri uri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(authority)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key)
.build();
context.getContentResolver().notifyChange(uri, null /* observer */);
}
}

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

@@ -18,7 +18,6 @@ package com.android.settings.slices;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
import android.annotation.ColorInt;
import android.app.PendingIntent;
@@ -158,8 +157,7 @@ public class SliceBuilderUtils {
final Intent intent = new Intent(action)
.setData(data.getUri())
.setClass(context, SliceBroadcastReceiver.class)
.putExtra(EXTRA_SLICE_KEY, data.getKey())
.putExtra(EXTRA_SLICE_PLATFORM_DEFINED, data.isPlatformDefined());
.putExtra(EXTRA_SLICE_KEY, data.getKey());
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
PendingIntent.FLAG_CANCEL_CURRENT);
}

14
src/com/android/settings/slices/SliceData.java
View File

@@ -71,8 +71,6 @@ public class SliceData {
@SliceType
private final int mSliceType;
private final boolean mIsPlatformDefined;
private final String mUnavailableSliceSubtitle;
public String getKey() {
@@ -115,10 +113,6 @@ public class SliceData {
return mSliceType;
}
public boolean isPlatformDefined() {
return mIsPlatformDefined;
}
public String getUnavailableSliceSubtitle() {
return mUnavailableSliceSubtitle;
}
@@ -134,7 +128,6 @@ public class SliceData {
mUri = builder.mUri;
mPreferenceController = builder.mPrefControllerClassName;
mSliceType = builder.mSliceType;
mIsPlatformDefined = builder.mIsPlatformDefined;
mUnavailableSliceSubtitle = builder.mUnavailableSliceSubtitle;
}
@@ -173,8 +166,6 @@ public class SliceData {
private int mSliceType;
private boolean mIsPlatformDefined;
private String mUnavailableSliceSubtitle;
public Builder setKey(String key) {
@@ -227,11 +218,6 @@ public class SliceData {
return this;
}
public Builder setPlatformDefined(boolean isPlatformDefined) {
mIsPlatformDefined = isPlatformDefined;
return this;
}
public Builder setUnavailableSliceSubtitle(
String unavailableSliceSubtitle) {
mUnavailableSliceSubtitle = unavailableSliceSubtitle;

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

@@ -19,7 +19,6 @@ package com.android.settings.slices;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_ICON;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_PLATFORM_SLICE_FLAG;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SUMMARY;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_TITLE;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_UNAVAILABLE_SLICE_SUBTITLE;
@@ -190,7 +189,6 @@ class SliceDataConverter {
| MetadataFlag.FLAG_NEED_PREF_TITLE
| MetadataFlag.FLAG_NEED_PREF_ICON
| MetadataFlag.FLAG_NEED_PREF_SUMMARY
| MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG
| MetadataFlag.FLAG_UNAVAILABLE_SLICE_SUBTITLE);
for (Bundle bundle : metadata) {
@@ -213,7 +211,6 @@ class SliceDataConverter {
final int iconResId = bundle.getInt(METADATA_ICON);
final int sliceType = controller.getSliceType();
final boolean isPlatformSlice = bundle.getBoolean(METADATA_PLATFORM_SLICE_FLAG);
final String unavailableSliceSubtitle = bundle.getString(
METADATA_UNAVAILABLE_SLICE_SUBTITLE);
@@ -227,7 +224,6 @@ class SliceDataConverter {
.setPreferenceControllerClassName(controllerClassName)
.setFragmentName(fragmentName)
.setSliceType(sliceType)
.setPlatformDefined(isPlatformSlice)
.setUnavailableSliceSubtitle(unavailableSliceSubtitle)
.build();

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

@@ -48,14 +48,10 @@ public class SlicesDatabaseAccessor {
IndexColumns.ICON_RESOURCE,
IndexColumns.FRAGMENT,
IndexColumns.CONTROLLER,
IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
};
// Cursor value for boolean true
private static final int TRUE = 1;
private final Context mContext;
private final SlicesDatabaseHelper mHelper;
@@ -159,8 +155,6 @@ public class SlicesDatabaseAccessor {
cursor.getColumnIndex(IndexColumns.FRAGMENT));
final String controllerClassName = cursor.getString(
cursor.getColumnIndex(IndexColumns.CONTROLLER));
final boolean isPlatformDefined = cursor.getInt(
cursor.getColumnIndex(IndexColumns.PLATFORM_SLICE)) == TRUE;
int sliceType = cursor.getInt(
cursor.getColumnIndex(IndexColumns.SLICE_TYPE));
final String unavailableSliceSubtitle = cursor.getString(
@@ -180,7 +174,6 @@ public class SlicesDatabaseAccessor {
.setFragmentName(fragmentClassName)
.setPreferenceControllerClassName(controllerClassName)
.setUri(uri)
.setPlatformDefined(isPlatformDefined)
.setSliceType(sliceType)
.setUnavailableSliceSubtitle(unavailableSliceSubtitle)
.build();

9
src/com/android/settings/slices/SlicesDatabaseHelper.java
View File

@@ -36,7 +36,7 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "slices_index.db";
private static final String SHARED_PREFS_TAG = "slices_shared_prefs";
private static final int DATABASE_VERSION = 6;
private static final int DATABASE_VERSION = 7;
public interface Tables {
String TABLE_SLICES_INDEX = "slices_index";
@@ -84,11 +84,6 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper {
*/
String CONTROLLER = "controller";
/**
* Boolean flag, {@code true} when the Slice is officially platform-supported.
*/
String PLATFORM_SLICE = "platform_slice";
/**
* {@link SliceData.SliceType} representing the inline type of the result.
*/
@@ -126,8 +121,6 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper {
", " +
IndexColumns.CONTROLLER +
", " +
IndexColumns.PLATFORM_SLICE +
", " +
IndexColumns.SLICE_TYPE +
", " +
IndexColumns.UNAVAILABLE_SLICE_SUBTITLE +

1
src/com/android/settings/slices/SlicesIndexer.java
View File

@@ -109,7 +109,6 @@ class SlicesIndexer implements Runnable {
values.put(IndexColumns.ICON_RESOURCE, dataRow.getIconResource());
values.put(IndexColumns.FRAGMENT, dataRow.getFragmentClassName());
values.put(IndexColumns.CONTROLLER, dataRow.getPreferenceController());
values.put(IndexColumns.PLATFORM_SLICE, dataRow.isPlatformDefined());
values.put(IndexColumns.SLICE_TYPE, dataRow.getSliceType());
values.put(IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
dataRow.getUnavailableSliceSubtitle());