commit e92e99b8eb4903a14ea7bf330afe16f7c54534a2
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Apr 19 02:00:15 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Apr 19 02:00:15 2018 +0000
tree 68d1532132a4affa767791f17fc5e3bd9eeb1304
parent 92ddc43f0872d32dd9d8c3623b2903f592d85246
parent 9a68a9ea62f566a511a7750083c42ea74c2f4f4e

[automerger] Small tweaks to positioning Clear-all button am: 9a68a9ea62

Change-Id: I87dd9ea9d2d746ceda71b42ec88ad1b9ed2da1c2

quickstep/res/layout/overview_clear_all_button.xml

diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index 8632f8b..79d8a61 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -1,6 +1,7 @@
 <?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"
@@ -10,5 +11,6 @@
     android:text="@string/recents_clear_all"
     android:textColor="?attr/workspaceTextColor"
     android:background="?android:attr/selectableItemBackground"
+    launcher:layout_ignoreInsets="true"
     android:textSize="14sp"
 />
\ No newline at end of file

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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java b/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java
index fe668c6..ece78c1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java
@@ -1,7 +1,5 @@
 package com.android.quickstep.views;
 
-import static com.android.quickstep.views.RecentsView.DEBUG_SHOW_CLEAR_ALL_BUTTON;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -49,10 +47,8 @@
     }
 
     @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-
-        if (!changed || !DEBUG_SHOW_CLEAR_ALL_BUTTON) return;
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         mRecentsView.getTaskSize(mTempRect);
 
@@ -60,8 +56,7 @@
                 (mClearAllButton.getMeasuredWidth() - getResources().getDimension(
                         R.dimen.clear_all_container_width)) / 2);
         mClearAllButton.setTranslationY(
-                mTempRect.top + (mTempRect.height() - mClearAllButton.getMeasuredHeight()) / 2
-                        - mClearAllButton.getTop());
+                mTempRect.top + (mTempRect.height() - mClearAllButton.getMeasuredHeight()) / 2);
     }
 
     @Override