summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-25 20:20:58 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-25 20:20:58 +0000
commit9ad0217a607c60cc16346be8082294e8e961e9f3 (patch)
tree744297155b66cac1b9ac729b9233980b7e79fe94
parent2f4f699cfc90fde6d52f9dd180ab67a86682268a (diff)
parent77cb385d47b638bd853ea3d7cea48ea1f8843f97 (diff)
downloadandroid_packages_apps_Trebuchet-9ad0217a607c60cc16346be8082294e8e961e9f3.tar.gz
android_packages_apps_Trebuchet-9ad0217a607c60cc16346be8082294e8e961e9f3.tar.bz2
android_packages_apps_Trebuchet-9ad0217a607c60cc16346be8082294e8e961e9f3.zip
[automerger] Improving highlight for Clear-all button. am: 77cb385d47
Change-Id: I1d0078d6d484d50edd24e4b45adc438e0d44700a
-rw-r--r--quickstep/res/layout/overview_clear_all_button.xml2
-rw-r--r--src/com/android/launcher3/PagedView.java5
2 files changed, 1 insertions, 6 deletions
diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index 8632f8bbd..c8f235fcd 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -3,12 +3,12 @@
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/clear_all_button"
+ style="@android:style/Widget.DeviceDefault.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|top"
android:fontFamily="sans-serif-medium"
android:text="@string/recents_clear_all"
android:textColor="?attr/workspaceTextColor"
- android:background="?android:attr/selectableItemBackground"
android:textSize="14sp"
/> \ No newline at end of file
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index fe953fe53..c2416d4e5 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1556,11 +1556,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
return mDownMotionY;
}
- @Override
- public boolean onHoverEvent(android.view.MotionEvent event) {
- return true;
- }
-
protected interface ComputePageScrollsLogic {
boolean shouldIncludeView(View view);