Merge "frameworks/base - Tiramisu is now 33" into tm-dev am: 595ec5f75c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699091

Change-Id: I4a8ea7de67cb9a29c467fafac75cd063b5468a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yurii Zubrytskyi
2022-04-12 19:57:42 +00:00
committed by Automerger Merge Worker
4 changed files with 10 additions and 1 deletions

View File

@@ -52021,7 +52021,6 @@ package android.view.accessibility {
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, 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 {

View File

@@ -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 {
public final class TranslationManager {

View File

@@ -5682,6 +5682,7 @@ public class AccessibilityNodeInfo implements Parcelable {
* @param heading Whether the item is a heading. (Prefer
* {@link AccessibilityNodeInfo#setHeading(boolean)})
* @param selected Whether the item is selected.
* @removed
*/
@Deprecated
@NonNull

View File

@@ -44,6 +44,7 @@ def ident(raw):
can be used to identify members across API levels."""
raw = raw.replace(" deprecated ", " ")
raw = raw.replace(" synchronized ", " ")
raw = raw.replace(" abstract ", " ")
raw = raw.replace(" final ", " ")
raw = re.sub("<.+?>", "", raw)
raw = re.sub("@[A-Za-z]+ ", "", raw)