| commit | b1ec2e6e4ae7def87b89a79936c3b5d4e73fcef2 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Mon May 13 17:08:36 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 13 17:08:36 2019 +0000 |
| tree | f19ce89cedbed3af7c77a2217be9497d5a1ae1ac | |
| parent | 001466d52aa30ee9cb0f85e5937f916df9c09d35 [diff] | |
| parent | 91cca5493748e7ec380a879e57a11b76c14f3a24 [diff] |
Merge "Revert "Use new not-deprecated builder constructors for AppTarget"" into ub-launcher3-master
diff --git a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java index da4c5e1..39f8448 100644 --- a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -92,11 +92,6 @@ // To be implemented } - @Override - public void onScrimColorsChanged(int color, int type) { - - } - /** Deprecated methods **/ public void onQuickStep(MotionEvent motionEvent) { }
diff --git a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java index 7f9f597..bcb6343 100644 --- a/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java +++ b/go/quickstep/src/com/android/quickstep/views/IconRecentsView.java
@@ -235,12 +235,8 @@ case ITEM_TYPE_CLEAR_ALL: outRect.top = (int) res.getDimension( R.dimen.clear_all_item_view_top_margin); - int desiredBottomMargin = (int) res.getDimension( + outRect.bottom = (int) res.getDimension( R.dimen.clear_all_item_view_bottom_margin); - // Only add bottom margin if insets aren't enough. - if (mInsets.bottom < desiredBottomMargin) { - outRect.bottom = desiredBottomMargin - mInsets.bottom; - } break; case ITEM_TYPE_TASK: int desiredTopMargin = (int) res.getDimension(
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index f38ad0d..128fd45 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -176,11 +176,6 @@ mSystemUiStateFlags = stateFlags; } - @Override - public void onScrimColorsChanged(int color, int type) { - - } - /** Deprecated methods **/ public void onQuickStep(MotionEvent motionEvent) { }