summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2018-04-19 18:43:04 -0700
committerVadim Tryshev <vadimt@google.com>2018-04-19 18:43:04 -0700
commit4473658c2fbf2bc04ad457c8f7fb23036f9eb2a2 (patch)
treebe910e21e42d092bad9a9be1c3830f8e534ee101
parent69632a46ab975e5410a098425c54d7d39cdc5d16 (diff)
downloadandroid_packages_apps_Trebuchet-4473658c2fbf2bc04ad457c8f7fb23036f9eb2a2.tar.gz
android_packages_apps_Trebuchet-4473658c2fbf2bc04ad457c8f7fb23036f9eb2a2.tar.bz2
android_packages_apps_Trebuchet-4473658c2fbf2bc04ad457c8f7fb23036f9eb2a2.zip
Not ignoring insets for Clear-all button
When in portrait mode with nav bar on the right , we need the right inset to be applied to the layout. Bug: 72222505 Test: Manual Change-Id: I06ac864097fb3cfb833de3e40921be4e19eb5f54
-rw-r--r--quickstep/res/layout/overview_clear_all_button.xml2
-rw-r--r--quickstep/src/com/android/quickstep/views/RecentsViewContainer.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index 79d8a615e..8632f8bbd 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/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"
/> \ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java b/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java
index ece78c1fd..5aface85e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsViewContainer.java
+++ b/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