diff options
author | Winson Chung <winsonc@google.com> | 2015-07-06 17:14:51 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-07-06 17:46:32 -0700 |
commit | 1ae7a5018b48dba562bc18821f0f1e778192ee85 (patch) | |
tree | 8f1cf80dccd6fd709141fa0d8027f2d897ff306f /src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java | |
parent | 1406fd80d59351e13b7be7f0997494761ffe7508 (diff) | |
download | android_packages_apps_Trebuchet-1ae7a5018b48dba562bc18821f0f1e778192ee85.tar.gz android_packages_apps_Trebuchet-1ae7a5018b48dba562bc18821f0f1e778192ee85.tar.bz2 android_packages_apps_Trebuchet-1ae7a5018b48dba562bc18821f0f1e778192ee85.zip |
Moving prediction icons back into recycler view.
- Fixes two accessibility issues with the prediction bar being
separate from the rest of the list of icons related to scrolling
and switch access.
Bug: 21725276
Change-Id: Ibc48e5028cace9a77000e6646b951f021910465d
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java index 1c51ab763..14e2a1863 100644 --- a/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsRecyclerViewContainerView.java @@ -37,7 +37,6 @@ public class AllAppsRecyclerViewContainerView extends FrameLayout implements BubbleTextShadowHandler { private final ClickShadowView mTouchFeedbackView; - private View mPredictionBarView; public AllAppsRecyclerViewContainerView(Context context) { this(context, null); @@ -61,13 +60,6 @@ public class AllAppsRecyclerViewContainerView extends FrameLayout } @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - mPredictionBarView = findViewById(R.id.prediction_bar); - } - - @Override public void setPressedIcon(BubbleTextView icon, Bitmap background) { if (icon == null || background == null) { mTouchFeedbackView.setBitmap(null); @@ -77,33 +69,4 @@ public class AllAppsRecyclerViewContainerView extends FrameLayout mTouchFeedbackView.animateShadow(); } } - - /** - * This allows us to have custom drawing order, while keeping touch handling in correct z-order. - */ - @Override - protected void dispatchDraw(Canvas canvas) { - final long drawingTime = getDrawingTime(); - - // Draw the click feedback first (since it is always on the bottom) - if (mTouchFeedbackView != null && mTouchFeedbackView.getVisibility() == View.VISIBLE) { - drawChild(canvas, mTouchFeedbackView, drawingTime); - } - - // Then draw the prediction bar, since it needs to be "under" the recycler view to get the - // right edge effect to be drawn over it - if (mPredictionBarView != null && mPredictionBarView.getVisibility() == View.VISIBLE) { - drawChild(canvas, mPredictionBarView, drawingTime); - } - - // Draw the remaining views - int childCount = getChildCount(); - for (int i = 0; i < childCount; i++) { - View v = getChildAt(i); - if (v != mTouchFeedbackView && v != mPredictionBarView && - v.getVisibility() == View.VISIBLE) { - drawChild(canvas, v, drawingTime); - } - } - } } |