diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-11 12:10:28 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-10-11 13:51:01 -0700 |
commit | a5f4e488dff461fbbc61400a8d284d9886164f76 (patch) | |
tree | 9d54af6e4ef8383f891673bbf6eca6d6574d65d1 /src/com/android/launcher3/Hotseat.java | |
parent | f7d458543e64307b01de803d2ddfee2f21b0bd28 (diff) | |
download | android_packages_apps_Trebuchet-a5f4e488dff461fbbc61400a8d284d9886164f76.tar.gz android_packages_apps_Trebuchet-a5f4e488dff461fbbc61400a8d284d9886164f76.tar.bz2 android_packages_apps_Trebuchet-a5f4e488dff461fbbc61400a8d284d9886164f76.zip |
Guarantee views are invisible after being faded (issue 11112570)
-> Prevent clicking of hotseat items during non-normal state
-> Update folder text edit highlight color (issue 11072862)
Change-Id: I0292b51dc5f7e318dc59e9a26bf1e39f333bc8eb
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 1f876fd6b..2aab64d73 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; import android.widget.TextView; @@ -175,6 +176,16 @@ public class Hotseat extends FrameLayout { } } + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + // We don't want any clicks to go through to the hotseat unless the workspace is in + // the normal state. + if (mLauncher.getWorkspace().isSmall()) { + return true; + } + return false; + } + void addAllAppsFolder(IconCache iconCache, ArrayList<AppInfo> allApps, ArrayList<ComponentName> onWorkspace, Launcher launcher, Workspace workspace) { |