Merge "frameworks/base - Tiramisu is now 33" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
595ec5f75c
@@ -52021,7 +52021,6 @@ package android.view.accessibility {
|
|||||||
method public boolean isSelected();
|
method public boolean isSelected();
|
||||||
method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
|
method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
|
||||||
method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
|
method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
|
||||||
method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class AccessibilityNodeInfo.CollectionItemInfo.Builder {
|
public static final class AccessibilityNodeInfo.CollectionItemInfo.Builder {
|
||||||
|
|||||||
@@ -525,6 +525,14 @@ package android.view {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package android.view.accessibility {
|
||||||
|
|
||||||
|
public static final class AccessibilityNodeInfo.CollectionItemInfo {
|
||||||
|
method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
package android.view.translation {
|
package android.view.translation {
|
||||||
|
|
||||||
public final class TranslationManager {
|
public final class TranslationManager {
|
||||||
|
|||||||
@@ -5682,6 +5682,7 @@ public class AccessibilityNodeInfo implements Parcelable {
|
|||||||
* @param heading Whether the item is a heading. (Prefer
|
* @param heading Whether the item is a heading. (Prefer
|
||||||
* {@link AccessibilityNodeInfo#setHeading(boolean)})
|
* {@link AccessibilityNodeInfo#setHeading(boolean)})
|
||||||
* @param selected Whether the item is selected.
|
* @param selected Whether the item is selected.
|
||||||
|
* @removed
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@NonNull
|
@NonNull
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ def ident(raw):
|
|||||||
can be used to identify members across API levels."""
|
can be used to identify members across API levels."""
|
||||||
raw = raw.replace(" deprecated ", " ")
|
raw = raw.replace(" deprecated ", " ")
|
||||||
raw = raw.replace(" synchronized ", " ")
|
raw = raw.replace(" synchronized ", " ")
|
||||||
|
raw = raw.replace(" abstract ", " ")
|
||||||
raw = raw.replace(" final ", " ")
|
raw = raw.replace(" final ", " ")
|
||||||
raw = re.sub("<.+?>", "", raw)
|
raw = re.sub("<.+?>", "", raw)
|
||||||
raw = re.sub("@[A-Za-z]+ ", "", raw)
|
raw = re.sub("@[A-Za-z]+ ", "", raw)
|
||||||
|
|||||||
Reference in New Issue
Block a user