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

Add interface and extend db to support storing slice uris

Browse Source 
Bug: 126222433
Test: manual
Change-Id: Ie81e69477d297aa96a0daad02d56196c956271a3
This commit is contained in:
Fan Zhang
2019-05-28 15:40:43 -07:00
parent befcd016b7
commit 225da1517c
5 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.IntentFilter;
import android.net.Uri;
import android.widget.Toast;
import com.android.settings.R;
@@ -54,6 +55,13 @@ public interface Sliceable {
return false;
}
/**
* Returns uri for this slice (if it's a slice).
*/
default Uri getSliceUri() {
return null;
}
/**
* @return {@code true} if the setting update asynchronously.
* <p>

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

@@ -53,7 +53,7 @@ public class SlicesDatabaseAccessor {
};
// Cursor value for boolean true
private final int TRUE = 1;
private static final int TRUE = 1;
private final Context mContext;
private final SlicesDatabaseHelper mHelper;
@@ -151,7 +151,7 @@ public class SlicesDatabaseAccessor {
.toString();
}
private SliceData buildSliceData(Cursor cursor, Uri uri, boolean isIntentOnly) {
private static SliceData buildSliceData(Cursor cursor, Uri uri, boolean isIntentOnly) {
final String key = cursor.getString(cursor.getColumnIndex(IndexColumns.KEY));
final String title = cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE));
final String summary = cursor.getString(cursor.getColumnIndex(IndexColumns.SUMMARY));

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 = 5;
private static final int DATABASE_VERSION = 6;
public interface Tables {
String TABLE_SLICES_INDEX = "slices_index";
@@ -98,6 +98,11 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper {
* Customized subtitle if it's a unavailable slice
*/
String UNAVAILABLE_SLICE_SUBTITLE = "unavailable_slice_subtitle";
/**
* The uri of slice.
*/
String SLICE_URI = "slice_uri";
}
private static final String CREATE_SLICES_TABLE =
@@ -105,6 +110,8 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper {
"(" +
IndexColumns.KEY +
", " +
IndexColumns.SLICE_URI +
", " +
IndexColumns.TITLE +
", " +
IndexColumns.SUMMARY +