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

Merge "API changes as requested by API council." into sc-dev

Browse Source
This commit is contained in:
Mathew Inwood
2021-04-21 08:40:16 +00:00
committed by Android (Google) Code Review
parent 8b946d5d10 c89513ac27
commit f715fddd3c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/AppCompatCallbacks.java
View File

@@ -28,7 +28,7 @@ import java.util.Arrays;
*
* @hide
*/
public final class AppCompatCallbacks extends Compatibility.Callbacks {
public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDelegate {
private final long[] mDisabledChanges;
private final ChangeReporter mChangeReporter;
@@ -38,7 +38,7 @@ public final class AppCompatCallbacks extends Compatibility.Callbacks {
* @param disabledChanges Set of compatibility changes that are disabled for this process.
*/
public static void install(long[] disabledChanges) {
Compatibility.setCallbacks(new AppCompatCallbacks(disabledChanges));
Compatibility.setBehaviorChangeDelegate(new AppCompatCallbacks(disabledChanges));
}
private AppCompatCallbacks(long[] disabledChanges) {
@@ -48,11 +48,11 @@ public final class AppCompatCallbacks extends Compatibility.Callbacks {
ChangeReporter.SOURCE_APP_PROCESS);
}
protected void reportChange(long changeId) {
public void onChangeReported(long changeId) {
reportChange(changeId, ChangeReporter.STATE_LOGGED);
}
protected boolean isChangeEnabled(long changeId) {
public boolean isChangeEnabled(long changeId) {
if (Arrays.binarySearch(mDisabledChanges, changeId) < 0) {
// Not present in the disabled array
reportChange(changeId, ChangeReporter.STATE_ENABLED);

8
core/java/android/view/MotionEvent.java
View File

@@ -2674,7 +2674,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* @see #AXIS_X
*/
public final float getRawX() {
Compatibility.reportChange(APP_USES_RAW_INPUT_COORDS);
Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);
return nativeGetRawAxisValue(mNativePtr, AXIS_X, 0, HISTORY_CURRENT);
}
@@ -2688,7 +2688,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* @see #AXIS_Y
*/
public final float getRawY() {
Compatibility.reportChange(APP_USES_RAW_INPUT_COORDS);
Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);
return nativeGetRawAxisValue(mNativePtr, AXIS_Y, 0, HISTORY_CURRENT);
}
@@ -2705,7 +2705,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* @see #AXIS_X
*/
public float getRawX(int pointerIndex) {
Compatibility.reportChange(APP_USES_RAW_INPUT_COORDS);
Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);
return nativeGetRawAxisValue(mNativePtr, AXIS_X, pointerIndex, HISTORY_CURRENT);
}
@@ -2722,7 +2722,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* @see #AXIS_Y
*/
public float getRawY(int pointerIndex) {
Compatibility.reportChange(APP_USES_RAW_INPUT_COORDS);
Compatibility.reportUnconditionalChange(APP_USES_RAW_INPUT_COORDS);
return nativeGetRawAxisValue(mNativePtr, AXIS_Y, pointerIndex, HISTORY_CURRENT);
}