From bbc2b688a79d4d6d740e1b8f757b0b86a191b0a0 Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Fri, 19 Apr 2019 14:01:25 -0400 Subject: [PATCH] Remove obsolete ChipsContainer Overview chips are now shown on top of the SuggestView, so there is no need to implement them separately in Launcher (now they live in the AiAi UI library). Change-Id: I49bfdcae7ed5ea3f1c40a539217579dfce5b3172 --- .../res/layout/hint_container.xml | 23 ------ .../RecentsViewStateController.java | 5 -- .../quickstep/hints/ChipsContainer.java | 72 ------------------- .../quickstep/views/LauncherRecentsView.java | 52 -------------- res/layout/hint_container.xml | 17 ----- res/layout/launcher.xml | 5 -- 6 files changed, 174 deletions(-) delete mode 100644 quickstep/recents_ui_overrides/res/layout/hint_container.xml delete mode 100644 quickstep/recents_ui_overrides/src/com/android/quickstep/hints/ChipsContainer.java delete mode 100644 res/layout/hint_container.xml diff --git a/quickstep/recents_ui_overrides/res/layout/hint_container.xml b/quickstep/recents_ui_overrides/res/layout/hint_container.xml deleted file mode 100644 index f8723fc81b..0000000000 --- a/quickstep/recents_ui_overrides/res/layout/hint_container.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - \ No newline at end of file diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java index 0d5574fa91..2267412da0 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java @@ -49,9 +49,6 @@ public final class RecentsViewStateController extends if (state.overviewUi) { mRecentsView.updateEmptyMessage(); mRecentsView.resetTaskVisuals(); - mRecentsView.setHintVisibility(1); - } else { - mRecentsView.setHintVisibility(0); } } @@ -62,7 +59,6 @@ public final class RecentsViewStateController extends if (!toState.overviewUi) { builder.addOnFinishRunnable(mRecentsView::resetTaskVisuals); - mRecentsView.setHintVisibility(0); } if (toState.overviewUi) { @@ -74,7 +70,6 @@ public final class RecentsViewStateController extends updateAnim.setDuration(config.duration); builder.play(updateAnim); mRecentsView.updateEmptyMessage(); - builder.addOnFinishRunnable(() -> mRecentsView.setHintVisibility(1)); } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/hints/ChipsContainer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/hints/ChipsContainer.java deleted file mode 100644 index 8fc89f2538..0000000000 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/hints/ChipsContainer.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep.hints; - -import android.content.Context; -import android.util.AttributeSet; -import android.util.FloatProperty; -import android.view.View; -import android.widget.FrameLayout; - -public class ChipsContainer extends FrameLayout { - - private static final String TAG = "ChipsContainer"; - - public static final FloatProperty HINT_VISIBILITY = - new FloatProperty("hint_visibility") { - @Override - public void setValue(ChipsContainer chipsContainer, float v) { - chipsContainer.setHintVisibility(v); - } - - @Override - public Float get(ChipsContainer chipsContainer) { - return chipsContainer.mHintVisibility; - } - }; - - private float mHintVisibility; - - public ChipsContainer(Context context) { - super(context); - } - - public ChipsContainer(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public ChipsContainer(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public ChipsContainer(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - public void setView(View v) { - removeAllViews(); - addView(v); - } - - public void setHintVisibility(float v) { - if (v == 1) { - setVisibility(VISIBLE); - } else { - setVisibility(GONE); - } - mHintVisibility = v; - } -} diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java index 1ccc3f16df..efe16c5576 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java @@ -39,11 +39,9 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.R; import com.android.launcher3.anim.Interpolators; -import com.android.launcher3.util.PendingAnimation; import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.views.ScrimView; import com.android.quickstep.SysUINavigationMode; -import com.android.quickstep.hints.ChipsContainer; import com.android.quickstep.util.ClipAnimationHelper; import com.android.quickstep.util.ClipAnimationHelper.TransformParams; import com.android.quickstep.util.LayoutUtils; @@ -55,7 +53,6 @@ import com.android.quickstep.util.LayoutUtils; public class LauncherRecentsView extends RecentsView { private final TransformParams mTransformParams = new TransformParams(); - private ChipsContainer mChipsContainer; public LauncherRecentsView(Context context) { this(context, null); @@ -75,14 +72,6 @@ public class LauncherRecentsView extends RecentsView { mActivity.getStateManager().goToState(NORMAL); } - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - mChipsContainer = mActivity.findViewById(R.id.hints); - BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) mChipsContainer.getLayoutParams(); - params.bottomMargin = mActivity.getDeviceProfile().chipHintBottomMarginPx; - } - @Override public void setTranslationY(float translationY) { super.setTranslationY(translationY); @@ -94,16 +83,6 @@ public class LauncherRecentsView extends RecentsView { } } - public void setHintVisibility(float v) { - if (mChipsContainer != null && ENABLE_HINTS_IN_OVERVIEW.get()) { - mChipsContainer.setHintVisibility(v); - } - } - - public ChipsContainer getChipsContainer() { - return mChipsContainer; - } - @Override public void draw(Canvas canvas) { maybeDrawEmptyMessage(canvas); @@ -154,37 +133,6 @@ public class LauncherRecentsView extends RecentsView { return anim; } - @Override - public PendingAnimation createTaskLauncherAnimation(TaskView tv, long duration) { - PendingAnimation anim = super.createTaskLauncherAnimation(tv, duration); - - if (ENABLE_HINTS_IN_OVERVIEW.get()) { - anim.anim.play(ObjectAnimator.ofFloat( - mChipsContainer, ChipsContainer.HINT_VISIBILITY, 0)); - } - - return anim; - } - - @Override - public PendingAnimation createTaskDismissAnimation(TaskView taskView, boolean animateTaskView, - boolean shouldRemoveTask, long duration) { - PendingAnimation anim = super.createTaskDismissAnimation(taskView, animateTaskView, - shouldRemoveTask, duration); - - if (ENABLE_HINTS_IN_OVERVIEW.get()) { - anim.anim.play(ObjectAnimator.ofFloat( - mChipsContainer, ChipsContainer.HINT_VISIBILITY, 0)); - anim.addEndListener(onEndListener -> { - if (!onEndListener.isSuccess) { - mChipsContainer.setHintVisibility(1); - } - }); - } - - return anim; - } - @Override protected void getTaskSize(DeviceProfile dp, Rect outRect) { LayoutUtils.calculateLauncherTaskSize(getContext(), dp, outRect); diff --git a/res/layout/hint_container.xml b/res/layout/hint_container.xml deleted file mode 100644 index 75aa913411..0000000000 --- a/res/layout/hint_container.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml index c9cea80624..6ecc1f55d2 100644 --- a/res/layout/launcher.xml +++ b/res/layout/launcher.xml @@ -52,11 +52,6 @@ layout="@layout/overview_panel" android:visibility="gone" /> - -