Update set/getMinDurationBetweenContentChanges per API Council feedback
Update name and use long
(Coninuation of aosp/2328994)
Relnote: Update rate limit Accessibility APIs to use Duration
Test: ./gradlew core:core:connectedAndroidTest --info --daemon \
-Pandroid.testInstrumentationRunnerArguments.class=androidx.core.view.accessibility.AccessibilityNodeInfoCompatTest
Change-Id: Ifa8bc8d237380aa877710ef7846b7d7495a75230
diff --git a/core/core/api/1.10.0-beta01.txt b/core/core/api/1.10.0-beta01.txt
index 5033a53..89ab8cc 100644
--- a/core/core/api/1.10.0-beta01.txt
+++ b/core/core/api/1.10.0-beta01.txt
@@ -3253,7 +3253,7 @@
method public androidx.core.view.accessibility.AccessibilityNodeInfoCompat! getLabeledBy();
method public int getLiveRegion();
method public int getMaxTextLength();
- method public int getMinMillisBetweenContentChanges();
+ method public long getMinDurationBetweenContentChanges();
method public int getMovementGranularities();
method public CharSequence! getPackageName();
method public CharSequence? getPaneTitle();
@@ -3339,7 +3339,7 @@
method public void setLiveRegion(int);
method public void setLongClickable(boolean);
method public void setMaxTextLength(int);
- method public void setMinMillisBetweenContentChanges(int);
+ method public void setMinDurationBetweenContentChanges(long);
method public void setMovementGranularities(int);
method public void setMultiLine(boolean);
method public void setPackageName(CharSequence!);
diff --git a/core/core/api/current.txt b/core/core/api/current.txt
index 5033a53..89ab8cc 100644
--- a/core/core/api/current.txt
+++ b/core/core/api/current.txt
@@ -3253,7 +3253,7 @@
method public androidx.core.view.accessibility.AccessibilityNodeInfoCompat! getLabeledBy();
method public int getLiveRegion();
method public int getMaxTextLength();
- method public int getMinMillisBetweenContentChanges();
+ method public long getMinDurationBetweenContentChanges();
method public int getMovementGranularities();
method public CharSequence! getPackageName();
method public CharSequence? getPaneTitle();
@@ -3339,7 +3339,7 @@
method public void setLiveRegion(int);
method public void setLongClickable(boolean);
method public void setMaxTextLength(int);
- method public void setMinMillisBetweenContentChanges(int);
+ method public void setMinDurationBetweenContentChanges(long);
method public void setMovementGranularities(int);
method public void setMultiLine(boolean);
method public void setPackageName(CharSequence!);
diff --git a/core/core/api/public_plus_experimental_1.10.0-beta01.txt b/core/core/api/public_plus_experimental_1.10.0-beta01.txt
index 2b431b6..8f6b30d 100644
--- a/core/core/api/public_plus_experimental_1.10.0-beta01.txt
+++ b/core/core/api/public_plus_experimental_1.10.0-beta01.txt
@@ -3259,7 +3259,7 @@
method public androidx.core.view.accessibility.AccessibilityNodeInfoCompat! getLabeledBy();
method public int getLiveRegion();
method public int getMaxTextLength();
- method public int getMinMillisBetweenContentChanges();
+ method public long getMinDurationBetweenContentChanges();
method public int getMovementGranularities();
method public CharSequence! getPackageName();
method public CharSequence? getPaneTitle();
@@ -3345,7 +3345,7 @@
method public void setLiveRegion(int);
method public void setLongClickable(boolean);
method public void setMaxTextLength(int);
- method public void setMinMillisBetweenContentChanges(int);
+ method public void setMinDurationBetweenContentChanges(long);
method public void setMovementGranularities(int);
method public void setMultiLine(boolean);
method public void setPackageName(CharSequence!);
diff --git a/core/core/api/public_plus_experimental_current.txt b/core/core/api/public_plus_experimental_current.txt
index 2b431b6..8f6b30d 100644
--- a/core/core/api/public_plus_experimental_current.txt
+++ b/core/core/api/public_plus_experimental_current.txt
@@ -3259,7 +3259,7 @@
method public androidx.core.view.accessibility.AccessibilityNodeInfoCompat! getLabeledBy();
method public int getLiveRegion();
method public int getMaxTextLength();
- method public int getMinMillisBetweenContentChanges();
+ method public long getMinDurationBetweenContentChanges();
method public int getMovementGranularities();
method public CharSequence! getPackageName();
method public CharSequence? getPaneTitle();
@@ -3345,7 +3345,7 @@
method public void setLiveRegion(int);
method public void setLongClickable(boolean);
method public void setMaxTextLength(int);
- method public void setMinMillisBetweenContentChanges(int);
+ method public void setMinDurationBetweenContentChanges(long);
method public void setMovementGranularities(int);
method public void setMultiLine(boolean);
method public void setPackageName(CharSequence!);
diff --git a/core/core/api/restricted_1.10.0-beta01.txt b/core/core/api/restricted_1.10.0-beta01.txt
index 9556806..58d61db 100644
--- a/core/core/api/restricted_1.10.0-beta01.txt
+++ b/core/core/api/restricted_1.10.0-beta01.txt
@@ -3720,7 +3720,7 @@
method public androidx.core.view.accessibility.AccessibilityNodeInfoCompat! getLabeledBy();
method public int getLiveRegion();
method public int getMaxTextLength();
- method public int getMinMillisBetweenContentChanges();
+ method public long getMinDurationBetweenContentChanges();
method public int getMovementGranularities();
method public CharSequence! getPackageName();
method public CharSequence? getPaneTitle();
@@ -3806,7 +3806,7 @@
method public void setLiveRegion(int);
method public void setLongClickable(boolean);
method public void setMaxTextLength(int);
- method public void setMinMillisBetweenContentChanges(int);
+ method public void setMinDurationBetweenContentChanges(long);
method public void setMovementGranularities(int);
method public void setMultiLine(boolean);
method public void setPackageName(CharSequence!);
diff --git a/core/core/api/restricted_current.txt b/core/core/api/restricted_current.txt
index 9556806..58d61db 100644
--- a/core/core/api/restricted_current.txt
+++ b/core/core/api/restricted_current.txt
@@ -3720,7 +3720,7 @@
method public androidx.core.view.accessibility.AccessibilityNodeInfoCompat! getLabeledBy();
method public int getLiveRegion();
method public int getMaxTextLength();
- method public int getMinMillisBetweenContentChanges();
+ method public long getMinDurationBetweenContentChanges();
method public int getMovementGranularities();
method public CharSequence! getPackageName();
method public CharSequence? getPaneTitle();
@@ -3806,7 +3806,7 @@
method public void setLiveRegion(int);
method public void setLongClickable(boolean);
method public void setMaxTextLength(int);
- method public void setMinMillisBetweenContentChanges(int);
+ method public void setMinDurationBetweenContentChanges(long);
method public void setMovementGranularities(int);
method public void setMultiLine(boolean);
method public void setPackageName(CharSequence!);
diff --git a/core/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java b/core/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
index 9df7bc0..200e35e 100644
--- a/core/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
+++ b/core/core/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
@@ -103,10 +103,10 @@
@SdkSuppress(minSdkVersion = 19)
@Test
- public void testGetSetMinMillisBetweenContentChanges() {
+ public void testGetSetMinDurationBetweenContentChanges() {
AccessibilityNodeInfoCompat nodeCompat = obtainedWrappedNodeCompat();
- nodeCompat.setMinMillisBetweenContentChanges(200);
- assertThat(nodeCompat.getMinMillisBetweenContentChanges(), equalTo(200));
+ nodeCompat.setMinDurationBetweenContentChanges(200L);
+ assertThat(nodeCompat.getMinDurationBetweenContentChanges(), equalTo(200L));
}
@SdkSuppress(minSdkVersion = 19)
diff --git a/core/core/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java b/core/core/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
index 3f54712a..8803a59 100644
--- a/core/core/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
+++ b/core/core/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
@@ -1314,9 +1314,9 @@
private static final String UNIQUE_ID_KEY =
"androidx.view.accessibility.AccessibilityNodeInfoCompat.UNIQUE_ID_KEY";
- private static final String MIN_MILLIS_BETWEEN_CONTENT_CHANGES_KEY =
+ private static final String MIN_DURATION_BETWEEN_CONTENT_CHANGES_KEY =
"androidx.view.accessibility.AccessibilityNodeInfoCompat."
- + "MIN_MILLIS_BETWEEN_CONTENT_CHANGES_KEY";
+ + "MIN_DURATION_BETWEEN_CONTENT_CHANGES_KEY";
// These don't line up with the internal framework constants, since they are independent
// and we might as well get all 32 bits of utility here.
@@ -2743,9 +2743,9 @@
/**
* Gets the minimum time duration between two content change events.
*/
- public int getMinMillisBetweenContentChanges() {
+ public long getMinDurationBetweenContentChanges() {
if (Build.VERSION.SDK_INT >= 19) {
- return Api19Impl.getExtras(mInfo).getInt(MIN_MILLIS_BETWEEN_CONTENT_CHANGES_KEY);
+ return Api19Impl.getExtras(mInfo).getLong(MIN_DURATION_BETWEEN_CONTENT_CHANGES_KEY);
}
return 0;
}
@@ -2755,7 +2755,7 @@
* content change events in accessibility services.
*
* <p>
- * Example: An app can set MinMillisBetweenContentChanges as 1 min for a view which sends
+ * Example: An app can set MinDurationBetweenContentChanges as 1 min for a view which sends
* content change events to accessibility services one event per second.
* Accessibility service will throttle those content change events and only handle one event
* per minute for that view.
@@ -2764,9 +2764,9 @@
* @see AccessibilityEventCompat#getContentChangeTypes for all content change types.
* @param duration the minimum duration between content change events.
*/
- public void setMinMillisBetweenContentChanges(int duration) {
+ public void setMinDurationBetweenContentChanges(long duration) {
if (Build.VERSION.SDK_INT >= 19) {
- Api19Impl.getExtras(mInfo).putInt(MIN_MILLIS_BETWEEN_CONTENT_CHANGES_KEY, duration);
+ Api19Impl.getExtras(mInfo).putLong(MIN_DURATION_BETWEEN_CONTENT_CHANGES_KEY, duration);
}
}
