Merge changes from topic "am-ea4e4c26-3457-4f3d-aad6-1b4329729c48" into ub-launcher3-master

* changes:
  [automerger] Not ignoring insets for Clear-all button am: 4473658c2f
  Not ignoring insets for Clear-all button

quickstep/res/layout/overview_clear_all_button.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView
-    xmlns:launcher="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/clear_all_button"
     android:layout_width="wrap_content"
@@ -11,6 +10,5 @@
     android:text="@string/recents_clear_all"
     android:textColor="?attr/workspaceTextColor"
     android:background="?android:attr/selectableItemBackground"
-    launcher:layout_ignoreInsets="true"
     android:textSize="14sp"
 />

quickstep/src/com/android/quickstep/views/RecentsViewContainer.java

@@ -56,7 +56,8 @@ public class RecentsViewContainer extends InsettableFrameLayout {
                 (mClearAllButton.getMeasuredWidth() - getResources().getDimension(
                         R.dimen.clear_all_container_width)) / 2);
         mClearAllButton.setTranslationY(
-                mTempRect.top + (mTempRect.height() - mClearAllButton.getMeasuredHeight()) / 2);
+                mTempRect.top + (mTempRect.height() - mClearAllButton.getMeasuredHeight()) / 2
+                        - mClearAllButton.getTop());
     }
 
     @Override