Fix previously uncallable methods in AccessibilityEventCompat
AccessibilityEventCompat is final and it has a private constructor.
We had getAction, setAction, getMovementGranularity, and setMovementGranularity
methods that were non static, thus it was impossible for anyone to call.
This CL adds 26.0.0.ignore file that suppresses the change from non-static
methods to static since in this instance it is an ok change.
Bug: 64378281
Test: ./gradlew assembleDebug checkApi
Change-Id: I2a524ab3ccccc9e0dbcc4bfb96e033a2dbfbb1dc
diff --git a/api/26.0.0.ignore b/api/26.0.0.ignore
new file mode 100644
index 0000000..4d85ac4
--- /dev/null
+++ b/api/26.0.0.ignore
@@ -0,0 +1,4 @@
+83a055e
+0af04fb
+7529650
+f41c100
\ No newline at end of file
diff --git a/api/27.0.0-SNAPSHOT.txt b/api/27.0.0-SNAPSHOT.txt
index f8c31bc..2a55629 100644
--- a/api/27.0.0-SNAPSHOT.txt
+++ b/api/27.0.0-SNAPSHOT.txt
@@ -9365,14 +9365,14 @@
public final class AccessibilityEventCompat {
method public static deprecated void appendRecord(android.view.accessibility.AccessibilityEvent, android.support.v4.view.accessibility.AccessibilityRecordCompat);
method public static deprecated android.support.v4.view.accessibility.AccessibilityRecordCompat asRecord(android.view.accessibility.AccessibilityEvent);
- method public int getAction(android.view.accessibility.AccessibilityEvent);
+ method public static int getAction(android.view.accessibility.AccessibilityEvent);
method public static int getContentChangeTypes(android.view.accessibility.AccessibilityEvent);
- method public int getMovementGranularity(android.view.accessibility.AccessibilityEvent);
+ method public static int getMovementGranularity(android.view.accessibility.AccessibilityEvent);
method public static deprecated android.support.v4.view.accessibility.AccessibilityRecordCompat getRecord(android.view.accessibility.AccessibilityEvent, int);
method public static deprecated int getRecordCount(android.view.accessibility.AccessibilityEvent);
- method public void setAction(android.view.accessibility.AccessibilityEvent, int);
+ method public static void setAction(android.view.accessibility.AccessibilityEvent, int);
method public static void setContentChangeTypes(android.view.accessibility.AccessibilityEvent, int);
- method public void setMovementGranularity(android.view.accessibility.AccessibilityEvent, int);
+ method public static void setMovementGranularity(android.view.accessibility.AccessibilityEvent, int);
field public static final int CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION = 4; // 0x4
field public static final int CONTENT_CHANGE_TYPE_SUBTREE = 1; // 0x1
field public static final int CONTENT_CHANGE_TYPE_TEXT = 2; // 0x2
diff --git a/compat/api/26.0.0.ignore b/compat/api/26.0.0.ignore
new file mode 100644
index 0000000..4d85ac4
--- /dev/null
+++ b/compat/api/26.0.0.ignore
@@ -0,0 +1,4 @@
+83a055e
+0af04fb
+7529650
+f41c100
\ No newline at end of file
diff --git a/compat/api/27.0.0-SNAPSHOT.txt b/compat/api/27.0.0-SNAPSHOT.txt
index b45dc21..13578e1 100644
--- a/compat/api/27.0.0-SNAPSHOT.txt
+++ b/compat/api/27.0.0-SNAPSHOT.txt
@@ -1863,14 +1863,14 @@
public final class AccessibilityEventCompat {
method public static deprecated void appendRecord(android.view.accessibility.AccessibilityEvent, android.support.v4.view.accessibility.AccessibilityRecordCompat);
method public static deprecated android.support.v4.view.accessibility.AccessibilityRecordCompat asRecord(android.view.accessibility.AccessibilityEvent);
- method public int getAction(android.view.accessibility.AccessibilityEvent);
+ method public static int getAction(android.view.accessibility.AccessibilityEvent);
method public static int getContentChangeTypes(android.view.accessibility.AccessibilityEvent);
- method public int getMovementGranularity(android.view.accessibility.AccessibilityEvent);
+ method public static int getMovementGranularity(android.view.accessibility.AccessibilityEvent);
method public static deprecated android.support.v4.view.accessibility.AccessibilityRecordCompat getRecord(android.view.accessibility.AccessibilityEvent, int);
method public static deprecated int getRecordCount(android.view.accessibility.AccessibilityEvent);
- method public void setAction(android.view.accessibility.AccessibilityEvent, int);
+ method public static void setAction(android.view.accessibility.AccessibilityEvent, int);
method public static void setContentChangeTypes(android.view.accessibility.AccessibilityEvent, int);
- method public void setMovementGranularity(android.view.accessibility.AccessibilityEvent, int);
+ method public static void setMovementGranularity(android.view.accessibility.AccessibilityEvent, int);
field public static final int CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION = 4; // 0x4
field public static final int CONTENT_CHANGE_TYPE_SUBTREE = 1; // 0x1
field public static final int CONTENT_CHANGE_TYPE_TEXT = 2; // 0x2
diff --git a/compat/java/android/support/v4/view/accessibility/AccessibilityEventCompat.java b/compat/java/android/support/v4/view/accessibility/AccessibilityEventCompat.java
index cb77fd5..462ad11 100644
--- a/compat/java/android/support/v4/view/accessibility/AccessibilityEventCompat.java
+++ b/compat/java/android/support/v4/view/accessibility/AccessibilityEventCompat.java
@@ -294,7 +294,7 @@
*
* @throws IllegalStateException If called from an AccessibilityService.
*/
- public void setMovementGranularity(AccessibilityEvent event, int granularity) {
+ public static void setMovementGranularity(AccessibilityEvent event, int granularity) {
if (Build.VERSION.SDK_INT >= 16) {
event.setMovementGranularity(granularity);
}
@@ -305,7 +305,7 @@
*
* @return The granularity.
*/
- public int getMovementGranularity(AccessibilityEvent event) {
+ public static int getMovementGranularity(AccessibilityEvent event) {
if (Build.VERSION.SDK_INT >= 16) {
return event.getMovementGranularity();
} else {
@@ -330,7 +330,7 @@
* @throws IllegalStateException If called from an AccessibilityService.
* @see AccessibilityNodeInfoCompat#performAction(int)
*/
- public void setAction(AccessibilityEvent event, int action) {
+ public static void setAction(AccessibilityEvent event, int action) {
if (Build.VERSION.SDK_INT >= 16) {
event.setAction(action);
}
@@ -341,7 +341,7 @@
*
* @return The action.
*/
- public int getAction(AccessibilityEvent event) {
+ public static int getAction(AccessibilityEvent event) {
if (Build.VERSION.SDK_INT >= 16) {
return event.getAction();
} else {