diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-05 22:09:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-05 22:09:24 +0000 |
| commit | 661e5583215937e1e632c6a5b5a685ffb78ce6ee (patch) | |
| tree | 65f5ff67ae8476b1252602b59ee3977f5abfe394 | |
| parent | 830578ff2299c04d1732d9474ef9a0984700d79b (diff) | |
| parent | d66e3b6a6510000d3d48f65e82b5b83d30ecb639 (diff) | |
| download | android_packages_apps_Trebuchet-661e5583215937e1e632c6a5b5a685ffb78ce6ee.tar.gz android_packages_apps_Trebuchet-661e5583215937e1e632c6a5b5a685ffb78ce6ee.tar.bz2 android_packages_apps_Trebuchet-661e5583215937e1e632c6a5b5a685ffb78ce6ee.zip | |
Merge "Removing unnecessary layout pass happening due when chaning gradientView visibility" into ub-launcher3-master
| -rw-r--r-- | res/layout/gradient_bg.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/widget/WidgetsBottomSheet.java | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/res/layout/gradient_bg.xml b/res/layout/gradient_bg.xml index db448d781..6c6626c1d 100644 --- a/res/layout/gradient_bg.xml +++ b/res/layout/gradient_bg.xml @@ -20,5 +20,4 @@ android:id="@+id/gradient_bg" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" launcher:layout_ignoreInsets="true" />
\ No newline at end of file diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 2cc078119..b844ba303 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -275,8 +275,7 @@ public class AllAppsTransitionController implements TouchController, SwipeDetect private void updateAllAppsBg(float progress) { // gradient if (mGradientView == null) { - mGradientView = (GradientView) mLauncher.findViewById(R.id.gradient_bg); - mGradientView.setVisibility(View.VISIBLE); + mGradientView = mLauncher.findViewById(R.id.gradient_bg); } mGradientView.setProgress(progress); } diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java index 432efa75e..7aa50a445 100644 --- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java @@ -107,7 +107,6 @@ public class WidgetsBottomSheet extends AbstractFloatingView implements Insettab onWidgetsBound(); mLauncher.getDragLayer().addView(mGradientBackground); - mGradientBackground.setVisibility(VISIBLE); mLauncher.getDragLayer().addView(this); measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); setTranslationY(mTranslationYClosed); |