summaryrefslogtreecommitdiffstats
path: root/quickstep/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-04-20 19:45:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-20 19:45:24 +0000
commitb138ca1665665ba8aabeba2f1bc50c4808b3b930 (patch)
tree616c6e7ab8197e9965403a75c6ab839c35b74bdb /quickstep/res
parent16fdada9d72fced855152affd9f4b6cdad76df9c (diff)
parent589e30162e487e3d93443c6983f8e743d4a7e5de (diff)
downloadandroid_packages_apps_Trebuchet-b138ca1665665ba8aabeba2f1bc50c4808b3b930.tar.gz
android_packages_apps_Trebuchet-b138ca1665665ba8aabeba2f1bc50c4808b3b930.tar.bz2
android_packages_apps_Trebuchet-b138ca1665665ba8aabeba2f1bc50c4808b3b930.zip
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
Diffstat (limited to 'quickstep/res')
-rw-r--r--quickstep/res/layout/overview_clear_all_button.xml2
1 files changed, 0 insertions, 2 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