diff options
9 files changed, 42 insertions, 49 deletions
diff --git a/api/current.txt b/api/current.txt index 5ec177104fcd..3c764fd1c19c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -289,14 +289,14 @@ package android { field public static final deprecated int animationResolution = 16843546; // 0x101031a field public static final int antialias = 16843034; // 0x101011a field public static final int anyDensity = 16843372; // 0x101026c - field public static final int apduServiceBanner = 16843758; // 0x10103ee + field public static final int apduServiceBanner = 16843757; // 0x10103ed field public static final int apiKey = 16843281; // 0x1010211 field public static final int author = 16843444; // 0x10102b4 field public static final int authorities = 16842776; // 0x1010018 field public static final int autoAdvanceViewId = 16843535; // 0x101030f field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b field public static final int autoLink = 16842928; // 0x10100b0 - field public static final int autoMirrored = 16843755; // 0x10103eb + field public static final int autoMirrored = 16843754; // 0x10103ea field public static final int autoStart = 16843445; // 0x10102b5 field public static final deprecated int autoText = 16843114; // 0x101016a field public static final int autoUrlDetect = 16843404; // 0x101028c @@ -393,7 +393,6 @@ package android { field public static final int cropToPadding = 16843043; // 0x1010123 field public static final int cursorVisible = 16843090; // 0x1010152 field public static final int customNavigationLayout = 16843474; // 0x10102d2 - field public static final int customRoots = 16843754; // 0x10103ea field public static final int customTokens = 16843579; // 0x101033b field public static final int cycles = 16843220; // 0x10101d4 field public static final int dashGap = 16843175; // 0x10101a7 @@ -846,7 +845,7 @@ package android { field public static final int prompt = 16843131; // 0x101017b field public static final int propertyName = 16843489; // 0x10102e1 field public static final int protectionLevel = 16842761; // 0x1010009 - field public static final int provideAssistData = 16843759; // 0x10103ef + field public static final int provideAssistData = 16843758; // 0x10103ee field public static final int publicKey = 16843686; // 0x10103a6 field public static final int queryActionMsg = 16843227; // 0x10101db field public static final int queryAfterZeroResults = 16843394; // 0x1010282 @@ -871,7 +870,7 @@ package android { field public static final int reqKeyboardType = 16843304; // 0x1010228 field public static final int reqNavigation = 16843306; // 0x101022a field public static final int reqTouchScreen = 16843303; // 0x1010227 - field public static final int requireDeviceUnlock = 16843757; // 0x10103ed + field public static final int requireDeviceUnlock = 16843756; // 0x10103ec field public static final int required = 16843406; // 0x101028e field public static final int requiredAccountType = 16843734; // 0x10103d6 field public static final int requiredForAllUsers = 16843728; // 0x10103d0 @@ -1020,7 +1019,7 @@ package android { field public static final int summaryOff = 16843248; // 0x10101f0 field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportsRtl = 16843695; // 0x10103af - field public static final int supportsSwitchingToNextInputMethod = 16843756; // 0x10103ec + field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb field public static final int supportsUploading = 16843419; // 0x101029b field public static final int switchMinWidth = 16843632; // 0x1010370 field public static final int switchPadding = 16843633; // 0x1010371 @@ -8140,7 +8139,7 @@ package android.database { public class MatrixCursor.RowBuilder { method public android.database.MatrixCursor.RowBuilder add(java.lang.Object); - method public android.database.MatrixCursor.RowBuilder offer(java.lang.String, java.lang.Object); + method public android.database.MatrixCursor.RowBuilder add(java.lang.String, java.lang.Object); } public class MergeCursor extends android.database.AbstractCursor { @@ -20774,7 +20773,6 @@ package android.provider { method public static android.net.Uri buildRootUri(java.lang.String, java.lang.String); method public static android.net.Uri buildRootsUri(java.lang.String); method public static android.net.Uri buildSearchDocumentsUri(java.lang.String, java.lang.String, java.lang.String); - method public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, java.lang.String, java.lang.String); method public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri); method public static java.lang.String getDocumentId(android.net.Uri); method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal); diff --git a/core/java/android/database/MatrixCursor.java b/core/java/android/database/MatrixCursor.java index 2a0d9b9f2842..5e107f23d3d4 100644 --- a/core/java/android/database/MatrixCursor.java +++ b/core/java/android/database/MatrixCursor.java @@ -186,7 +186,7 @@ public class MatrixCursor extends AbstractCursor { * column value at a time. This follows the same ordering as the column * names specified at cursor construction time. * <li>Column and value pairs can be offered for possible inclusion using - * {@link #offer(String, Object)}. If the cursor includes the given column, + * {@link #add(String, Object)}. If the cursor includes the given column, * the value will be set for that column, otherwise the value is ignored. * This approach is useful when matching data to a custom projection. * </ul> @@ -227,7 +227,7 @@ public class MatrixCursor extends AbstractCursor { * * @return this builder to support chaining */ - public RowBuilder offer(String columnName, Object value) { + public RowBuilder add(String columnName, Object value) { for (int i = 0; i < columnNames.length; i++) { if (columnName.equals(columnNames[i])) { data[(row * columnCount) + i] = value; diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index eaa4f78a1005..91b3b48ab17e 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -694,6 +694,7 @@ public final class DocumentsContract { * @param mimeType MIME type of new document * @param displayName name of new document * @return newly created document, or {@code null} if failed + * @hide */ public static Uri createDocument(ContentResolver resolver, Uri parentDocumentUri, String mimeType, String displayName) { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index a47e518f2d04..7ddf2e9fbb23 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6128,8 +6128,4 @@ <attr name="textView" format="reference" /> </declare-styleable> - <declare-styleable name="DocumentsProviderInfo"> - <attr name="customRoots" format="boolean" /> - </declare-styleable> - </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6c3856ec1e4b..1b4a08380a6f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2073,7 +2073,6 @@ <public type="attr" name="vendor" /> <public type="attr" name="category" /> <public type="attr" name="isAsciiCapable" /> - <public type="attr" name="customRoots" /> <public type="attr" name="autoMirrored" /> <public type="attr" name="supportsSwitchingToNextInputMethod" /> <public type="attr" name="requireDeviceUnlock" /> diff --git a/core/tests/coretests/src/android/database/MatrixCursorTest.java b/core/tests/coretests/src/android/database/MatrixCursorTest.java index fc48c17db839..aa805dca817e 100644 --- a/core/tests/coretests/src/android/database/MatrixCursorTest.java +++ b/core/tests/coretests/src/android/database/MatrixCursorTest.java @@ -132,18 +132,18 @@ public class MatrixCursorTest extends TestCase { MatrixCursor cursor = newMatrixCursor(); cursor.newRow() - .offer("float", 4.2f) - .offer("string", "foobar") - .offer("blob", new byte[] {(byte) 0xaa, (byte) 0x55}) - .offer("lolwat", "kittens"); + .add("float", 4.2f) + .add("string", "foobar") + .add("blob", new byte[] {(byte) 0xaa, (byte) 0x55}) + .add("lolwat", "kittens"); cursor.newRow(); cursor.newRow() - .offer("string", "zero") - .offer("string", "one") - .offer("string", "two") - .offer("lolwat", "kittens"); + .add("string", "zero") + .add("string", "one") + .add("string", "two") + .add("lolwat", "kittens"); assertTrue(cursor.moveToFirst()); assertEquals("foobar", cursor.getString(0)); diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java index 8530a9f9b100..adf4701884e2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java @@ -90,7 +90,6 @@ public class RootsCache { if (info.metaData != null && info.metaData.containsKey( DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) { - // TODO: remove deprecated customRoots flag // TODO: populate roots on background thread, and cache results final Uri rootsUri = DocumentsContract.buildRootsUri(info.authority); final ContentProviderClient client = resolver diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 226d6351e96f..2326ec2c1797 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -181,12 +181,12 @@ public class ExternalStorageProvider extends DocumentsProvider { } final RowBuilder row = result.newRow(); - row.offer(Document.COLUMN_DOCUMENT_ID, docId); - row.offer(Document.COLUMN_DISPLAY_NAME, displayName); - row.offer(Document.COLUMN_SIZE, file.length()); - row.offer(Document.COLUMN_MIME_TYPE, mimeType); - row.offer(Document.COLUMN_LAST_MODIFIED, file.lastModified()); - row.offer(Document.COLUMN_FLAGS, flags); + row.add(Document.COLUMN_DOCUMENT_ID, docId); + row.add(Document.COLUMN_DISPLAY_NAME, displayName); + row.add(Document.COLUMN_SIZE, file.length()); + row.add(Document.COLUMN_MIME_TYPE, mimeType); + row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified()); + row.add(Document.COLUMN_FLAGS, flags); } @Override @@ -197,13 +197,13 @@ public class ExternalStorageProvider extends DocumentsProvider { final File path = mIdToPath.get(rootId); final RowBuilder row = result.newRow(); - row.offer(Root.COLUMN_ROOT_ID, root.rootId); - row.offer(Root.COLUMN_ROOT_TYPE, root.rootType); - row.offer(Root.COLUMN_FLAGS, root.flags); - row.offer(Root.COLUMN_ICON, root.icon); - row.offer(Root.COLUMN_TITLE, root.title); - row.offer(Root.COLUMN_DOCUMENT_ID, root.docId); - row.offer(Root.COLUMN_AVAILABLE_BYTES, path.getFreeSpace()); + row.add(Root.COLUMN_ROOT_ID, root.rootId); + row.add(Root.COLUMN_ROOT_TYPE, root.rootType); + row.add(Root.COLUMN_FLAGS, root.flags); + row.add(Root.COLUMN_ICON, root.icon); + row.add(Root.COLUMN_TITLE, root.title); + row.add(Root.COLUMN_DOCUMENT_ID, root.docId); + row.add(Root.COLUMN_AVAILABLE_BYTES, path.getFreeSpace()); } return result; } diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java index 93db592ea79a..014c664d1feb 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java @@ -69,13 +69,13 @@ public class TestDocumentsProvider extends DocumentsProvider { final MatrixCursor result = new MatrixCursor(resolveRootProjection(projection)); final RowBuilder row = result.newRow(); - row.offer(Root.COLUMN_ROOT_ID, MY_ROOT_ID); - row.offer(Root.COLUMN_ROOT_TYPE, Root.ROOT_TYPE_SERVICE); - row.offer(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_RECENTS); - row.offer(Root.COLUMN_TITLE, "_Test title which is really long"); - row.offer(Root.COLUMN_SUMMARY, "_Summary which is also super long text"); - row.offer(Root.COLUMN_DOCUMENT_ID, MY_DOC_ID); - row.offer(Root.COLUMN_AVAILABLE_BYTES, 1024); + row.add(Root.COLUMN_ROOT_ID, MY_ROOT_ID); + row.add(Root.COLUMN_ROOT_TYPE, Root.ROOT_TYPE_SERVICE); + row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_RECENTS); + row.add(Root.COLUMN_TITLE, "_Test title which is really long"); + row.add(Root.COLUMN_SUMMARY, "_Summary which is also super long text"); + row.add(Root.COLUMN_DOCUMENT_ID, MY_DOC_ID); + row.add(Root.COLUMN_AVAILABLE_BYTES, 1024); return result; } @@ -234,16 +234,16 @@ public class TestDocumentsProvider extends DocumentsProvider { private static void includeFile(MatrixCursor result, String docId) { final RowBuilder row = result.newRow(); - row.offer(Document.COLUMN_DOCUMENT_ID, docId); - row.offer(Document.COLUMN_DISPLAY_NAME, docId); - row.offer(Document.COLUMN_LAST_MODIFIED, System.currentTimeMillis()); + row.add(Document.COLUMN_DOCUMENT_ID, docId); + row.add(Document.COLUMN_DISPLAY_NAME, docId); + row.add(Document.COLUMN_LAST_MODIFIED, System.currentTimeMillis()); if (MY_DOC_ID.equals(docId)) { - row.offer(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR); + row.add(Document.COLUMN_MIME_TYPE, Document.MIME_TYPE_DIR); } else if (MY_DOC_NULL.equals(docId)) { // No MIME type } else { - row.offer(Document.COLUMN_MIME_TYPE, "application/octet-stream"); + row.add(Document.COLUMN_MIME_TYPE, "application/octet-stream"); } } } |