diff options
| author | Winson Chung <winsonc@google.com> | 2016-07-21 16:58:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-21 16:58:42 +0000 |
| commit | 06580312edc1fd1a94746de0626022e60d8e614e (patch) | |
| tree | fa347e80cb3bdc1676484edda410f6d02e188c69 /src/com/android/launcher3/allapps | |
| parent | 35a754bade013ce240bdfff584b250d69370fdb4 (diff) | |
| parent | 6231ede10c16db8399b1d42b9b1829c95de83629 (diff) | |
| download | android_packages_apps_Trebuchet-06580312edc1fd1a94746de0626022e60d8e614e.tar.gz android_packages_apps_Trebuchet-06580312edc1fd1a94746de0626022e60d8e614e.tar.bz2 android_packages_apps_Trebuchet-06580312edc1fd1a94746de0626022e60d8e614e.zip | |
Merge changes I09bce218,Id5716a34 into ub-launcher3-calgary
* changes:
Matching hotseat to spec.
Fixing issue with shadow drawing over search bar.
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java index 09a7d59bf..1d5b209c2 100644 --- a/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java @@ -18,6 +18,7 @@ package com.android.launcher3.allapps; import android.content.Context; import android.graphics.Bitmap; import android.util.AttributeSet; +import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -26,6 +27,7 @@ import com.android.launcher3.BubbleTextView.BubbleTextShadowHandler; import com.android.launcher3.ClickShadowView; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; +import com.android.launcher3.R; /** * A container for RecyclerView to allow for the click shadow view to be shown behind an icon that @@ -63,7 +65,8 @@ public class AllAppsRecyclerViewContainerView extends FrameLayout mTouchFeedbackView.setBitmap(null); mTouchFeedbackView.animate().cancel(); } else if (mTouchFeedbackView.setBitmap(background)) { - mTouchFeedbackView.alignWithIconView(icon, (ViewGroup) icon.getParent()); + View rv = findViewById(R.id.apps_list_view); + mTouchFeedbackView.alignWithIconView(icon, (ViewGroup) icon.getParent(), rv); mTouchFeedbackView.animateShadow(); } } |