diff options
| author | Adrian Roos <roosa@google.com> | 2020-03-12 18:30:54 +0000 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2020-03-13 19:40:34 +0000 |
| commit | 5ad8cd2586cb384b364d32d42e9c543c6eca0191 (patch) | |
| tree | 78f76a0b0db7957397e25fbc33fbc83b574a06b4 /tests/WindowInsetsTests/src | |
| parent | a03b6abb5be607a0dfb3b913a21011863225af6e (diff) | |
Revert "Revert "WindowInsetsController: Address API feedback""
This reverts commit 5e7097b21ea3841550044b933238f273be7cf2b6
and relands Id4cb53fddcecac17b7926068046760df5130dc39
Change-Id: I348141f27efcf7c22736778fbcdde4a110e95982
Fixes: 150472709
Test: atest InsetsControllerTest
Diffstat (limited to 'tests/WindowInsetsTests/src')
| -rw-r--r-- | tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java | 6 |
1 files changed, 2 insertions, 4 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 e41517085c36..f254e4d3267a 100644 --- a/tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java +++ b/tests/WindowInsetsTests/src/com/google/android/test/windowinsetstests/WindowInsetsActivity.java @@ -34,9 +34,7 @@ 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; @@ -101,7 +99,7 @@ public class WindowInsetsActivity extends AppCompatActivity { && !mRequestedController) { mRequestedController = true; v.getWindowInsetsController().controlWindowInsetsAnimation(ime(), - 1000, new LinearInterpolator(), + 1000, new LinearInterpolator(), null /* cancellationSignal */, mCurrentRequest = new WindowInsetsAnimationControlListener() { @Override public void onReady( @@ -208,7 +206,7 @@ public class WindowInsetsActivity extends AppCompatActivity { if ((types & ime()) != 0 && !hasControl) { hasControl = true; controller.controlWindowInsetsAnimation(ime(), -1, - new LinearInterpolator(), + new LinearInterpolator(), null /* cancellationSignal */, new WindowInsetsAnimationControlListener() { @Override public void onReady( |