Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-28 06:42:17 +00:00
committed by Android (Google) Code Review
parent 70c0221813 09a70628da
commit 3dfd827574
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -46521,7 +46521,7 @@ package android.view {
public static abstract class ViewStructure.HtmlInfo {
ctor public ViewStructure.HtmlInfo();
method public abstract java.util.ArrayList<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
method public abstract java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
method public abstract java.lang.String getTag();
}

2
api/system-current.txt
View File

@@ -50106,7 +50106,7 @@ package android.view {
public static abstract class ViewStructure.HtmlInfo {
ctor public ViewStructure.HtmlInfo();
method public abstract java.util.ArrayList<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
method public abstract java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
method public abstract java.lang.String getTag();
}

2
api/test-current.txt
View File

@@ -46896,7 +46896,7 @@ package android.view {
public static abstract class ViewStructure.HtmlInfo {
ctor public ViewStructure.HtmlInfo();
method public abstract java.util.ArrayList<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
method public abstract java.util.List<android.util.Pair<java.lang.String, java.lang.String>> getAttributes();
method public abstract java.lang.String getTag();
}

3
core/java/android/app/assist/AssistStructure.java
View File

@@ -34,6 +34,7 @@ import android.view.autofill.AutofillValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* Assist data automatically created by the platform's implementation of Assist and Autofill.
@@ -1791,7 +1792,7 @@ public class AssistStructure implements Parcelable {
}
@Override
public ArrayList<Pair<String, String>> getAttributes() {
public List<Pair<String, String>> getAttributes() {
if (mAttributes == null && mNames != null) {
mAttributes = new ArrayList<>(mNames.length);
for (int i = 0; i < mNames.length; i++) {

4
core/java/android/view/ViewStructure.java
View File

@@ -26,7 +26,7 @@ import android.util.Pair;
import android.view.autofill.AutofillId;
import android.view.autofill.AutofillValue;
import java.util.ArrayList;
import java.util.List;
/**
* Container for storing additional per-view data generated by {@link View#onProvideStructure
@@ -429,7 +429,7 @@ public abstract class ViewStructure {
* @return list of key/value pairs; could contain pairs with the same keys.
*/
@Nullable
public abstract ArrayList<Pair<String, String>> getAttributes();
public abstract List<Pair<String, String>> getAttributes();
/**
* Builder for {@link HtmlInfo} objects.