Merge "Add some floating views that should hide back button" into ub-launcher3-qt-dev
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) { }
diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 73f11b2..cd0ae3d 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -568,6 +568,17 @@
}
});
+ if (originalView instanceof BubbleTextView) {
+ BubbleTextView btv = (BubbleTextView) originalView;
+ btv.forceHideDot(true);
+ fade.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ btv.forceHideDot(false);
+ }
+ });
+ }
+
if (originalView instanceof FolderIcon) {
FolderIcon folderIcon = (FolderIcon) originalView;
folderIcon.setBackgroundVisible(false);