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

Change-Id: I87dd9ea9d2d746ceda71b42ec88ad1b9ed2da1c2
This commit is contained in:
Android Build Merger (Role)
2018-04-19 02:00:15 +00:00
2 changed files with 5 additions and 8 deletions
@@ -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"
/>
@@ -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 @@ public class RecentsViewContainer extends InsettableFrameLayout {
}
@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 @@ 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
- mClearAllButton.getTop());
mTempRect.top + (mTempRect.height() - mClearAllButton.getMeasuredHeight()) / 2);
}
@Override