diff options
| author | Jaineel Mehta <jaineelm@google.com> | 2020-03-12 17:46:17 +0000 |
|---|---|---|
| committer | Jaineel Mehta <jaineelm@google.com> | 2020-03-12 17:46:17 +0000 |
| commit | 5e7097b21ea3841550044b933238f273be7cf2b6 (patch) | |
| tree | c827eb75f1f846232040c20b718e91374c1b8ac1 /tests/WindowInsetsTests | |
| parent | c549e19c5efd37494dac75e4b372d126f1d2bf19 (diff) | |
Revert "WindowInsetsController: Address API feedback"
This reverts commit c549e19c5efd37494dac75e4b372d126f1d2bf19.
Reason for revert: Droidcop: Potential culprit for Bug X - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I2ab42d96d2599dfcc946fa48b3940e2bd92b22b0
Diffstat (limited to 'tests/WindowInsetsTests')
| -rw-r--r-- | tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java b/tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java index f254e4d3267a..e41517085c36 100644 --- a/tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java +++ b/tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java @@ -34,7 +34,9 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; +import android.view.Window; import android.view.WindowInsets; +import android.view.WindowInsets.Type; import android.view.WindowInsetsAnimation; import android.view.WindowInsetsAnimation.Callback; import android.view.WindowInsetsAnimationControlListener; @@ -99,7 +101,7 @@ public class WindowInsetsActivity extends AppCompatActivity { && !mRequestedController) { mRequestedController = true; v.getWindowInsetsController().controlWindowInsetsAnimation(ime(), - 1000, new LinearInterpolator(), null /* cancellationSignal */, + 1000, new LinearInterpolator(), mCurrentRequest = new WindowInsetsAnimationControlListener() { @Override public void onReady( @@ -206,7 +208,7 @@ public class WindowInsetsActivity extends AppCompatActivity { if ((types & ime()) != 0 && !hasControl) { hasControl = true; controller.controlWindowInsetsAnimation(ime(), -1, - new LinearInterpolator(), null /* cancellationSignal */, + new LinearInterpolator(), new WindowInsetsAnimationControlListener() { @Override public void onReady( |