Merge "Cache Device Motion Prediction Availability" into udc-dev
diff --git a/core/java/android/view/MotionPredictor.java b/core/java/android/view/MotionPredictor.java
index 7d452f9..27af300 100644
--- a/core/java/android/view/MotionPredictor.java
+++ b/core/java/android/view/MotionPredictor.java
@@ -49,15 +49,17 @@
// Pointer to the native object.
private final long mPtr;
- private final Context mContext;
+ // Device-specific override to enable/disable motion prediction.
+ private final boolean mIsPredictionEnabled;
/**
* Create a new MotionPredictor for the provided {@link Context}.
* @param context The context for the predictions
*/
public MotionPredictor(@NonNull Context context) {
- mContext = context;
- final int offsetNanos = mContext.getResources().getInteger(
+ mIsPredictionEnabled = context.getResources().getBoolean(
+ com.android.internal.R.bool.config_enableMotionPrediction);
+ final int offsetNanos = context.getResources().getInteger(
com.android.internal.R.integer.config_motionPredictionOffsetNanos);
mPtr = nativeInitialize(offsetNanos);
RegistryHolder.REGISTRY.registerNativeAllocation(this, mPtr);
@@ -73,7 +75,7 @@
* @throws IllegalArgumentException if an inconsistent MotionEvent stream is sent.
*/
public void record(@NonNull MotionEvent event) {
- if (!isPredictionEnabled()) {
+ if (!mIsPredictionEnabled) {
return;
}
nativeRecord(mPtr, event);
@@ -94,21 +96,12 @@
*/
@Nullable
public MotionEvent predict(long predictionTimeNanos) {
- if (!isPredictionEnabled()) {
+ if (!mIsPredictionEnabled) {
return null;
}
return nativePredict(mPtr, predictionTimeNanos);
}
- private boolean isPredictionEnabled() {
- // Device-specific override
- if (!mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_enableMotionPrediction)) {
- return false;
- }
- return true;
- }
-
/**
* Check whether a device supports motion predictions for a given source type.
*
@@ -120,7 +113,7 @@
* @see MotionEvent#getSource
*/
public boolean isPredictionAvailable(int deviceId, int source) {
- return isPredictionEnabled() && nativeIsPredictionAvailable(mPtr, deviceId, source);
+ return mIsPredictionEnabled && nativeIsPredictionAvailable(mPtr, deviceId, source);
}
private static native long nativeInitialize(int offsetNanos);