PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implements the new subscript proactive suggestions style" into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
Govinda Wasserman
2019-05-10 16:30:04 +00:00
committed by Android (Google) Code Review
parent 0f07b87420 ede5052227
commit c8dc2ecb4a
7 changed files with 170 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/res/layout/proactive_hints_container.xml
+7
View File
@@ -0,0 +1,7 @@
<com.android.quickstep.hints.ProactiveHintsContainer
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:gravity="center_horizontal">
</com.android.quickstep.hints.ProactiveHintsContainer>
quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsViewStateController.java
+18
View File
@@ -31,6 +31,7 @@ import com.android.launcher3.LauncherState;
import com.android.launcher3.LauncherStateManager.AnimationConfig;
import com.android.launcher3.anim.AnimatorSetBuilder;
import com.android.launcher3.anim.PropertySetter;
import com.android.quickstep.hints.ProactiveHintsContainer;
import com.android.quickstep.views.ClearAllButton;
import com.android.quickstep.views.LauncherRecentsView;
import com.android.quickstep.views.RecentsView;
@@ -53,6 +54,14 @@ public final class RecentsViewStateController extends
if (state.overviewUi) {
mRecentsView.updateEmptyMessage();
mRecentsView.resetTaskVisuals();
mRecentsView.setHintVisibility(1f);
} else {
mRecentsView.setHintVisibility(0f);
ProactiveHintsContainer
proactiveHintsContainer = mRecentsView.getProactiveHintsContainer();
if (proactiveHintsContainer != null) {
proactiveHintsContainer.removeAllViews();
}
}
setAlphas(PropertySetter.NO_ANIM_PROPERTY_SETTER, state.getVisibleElements(mLauncher));
}
@@ -64,6 +73,14 @@ public final class RecentsViewStateController extends
if (!toState.overviewUi) {
builder.addOnFinishRunnable(mRecentsView::resetTaskVisuals);
mRecentsView.setHintVisibility(0f);
builder.addOnFinishRunnable(() -> {
ProactiveHintsContainer
proactiveHintsContainer = mRecentsView.getProactiveHintsContainer();
if (proactiveHintsContainer != null) {
proactiveHintsContainer.removeAllViews();
}
});
}
if (toState.overviewUi) {
@@ -75,6 +92,7 @@ public final class RecentsViewStateController extends
updateAnim.setDuration(config.duration);
builder.play(updateAnim);
mRecentsView.updateEmptyMessage();
builder.addOnFinishRunnable(() -> mRecentsView.setHintVisibility(1f));
}
setAlphas(config.getPropertySetter(builder), toState.getVisibleElements(mLauncher));
quickstep/recents_ui_overrides/src/com/android/quickstep/hints/ProactiveHintsContainer.java
+55
View File
@@ -0,0 +1,55 @@
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 ProactiveHintsContainer extends FrameLayout {
public static final FloatProperty<ProactiveHintsContainer> HINT_VISIBILITY =
new FloatProperty<ProactiveHintsContainer>("hint_visibility") {
@Override
public void setValue(ProactiveHintsContainer proactiveHintsContainer, float v) {
proactiveHintsContainer.setHintVisibility(v);
}
@Override
public Float get(ProactiveHintsContainer proactiveHintsContainer) {
return proactiveHintsContainer.mHintVisibility;
}
};
private float mHintVisibility;
public ProactiveHintsContainer(Context context) {
super(context);
}
public ProactiveHintsContainer(Context context, AttributeSet attrs) {
super(context, attrs);
}
public ProactiveHintsContainer(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public ProactiveHintsContainer(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;
}
}
quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
+64
View File
@@ -34,6 +34,8 @@ import android.os.Build;
import android.util.AttributeSet;
import android.view.View;
import androidx.annotation.Nullable;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
@@ -41,8 +43,11 @@ import com.android.launcher3.R;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.appprediction.PredictionUiStateManager;
import com.android.launcher3.appprediction.PredictionUiStateManager.Client;
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.ProactiveHintsContainer;
import com.android.quickstep.util.ClipAnimationHelper;
import com.android.quickstep.util.ClipAnimationHelper.TransformParams;
import com.android.quickstep.util.LayoutUtils;
@@ -54,6 +59,8 @@ import com.android.quickstep.util.LayoutUtils;
public class LauncherRecentsView extends RecentsView<Launcher> {
private final TransformParams mTransformParams = new TransformParams();
private final int mChipOverhang;
@Nullable private ProactiveHintsContainer mProactiveHintsContainer;
public LauncherRecentsView(Context context) {
this(context, null);
@@ -66,6 +73,16 @@ public class LauncherRecentsView extends RecentsView<Launcher> {
public LauncherRecentsView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
setContentAlpha(0);
mChipOverhang = (int) context.getResources().getDimension(R.dimen.chip_hint_overhang);
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
View hintContainer = mActivity.findViewById(R.id.hints);
mProactiveHintsContainer =
hintContainer instanceof ProactiveHintsContainer
? (ProactiveHintsContainer) hintContainer : null;
}
@Override
@@ -84,6 +101,11 @@ public class LauncherRecentsView extends RecentsView<Launcher> {
}
}
@Nullable
public ProactiveHintsContainer getProactiveHintsContainer() {
return mProactiveHintsContainer;
}
@Override
public void draw(Canvas canvas) {
maybeDrawEmptyMessage(canvas);
@@ -137,6 +159,48 @@ public class LauncherRecentsView extends RecentsView<Launcher> {
@Override
protected void getTaskSize(DeviceProfile dp, Rect outRect) {
LayoutUtils.calculateLauncherTaskSize(getContext(), dp, outRect);
if (mProactiveHintsContainer != null) {
BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) mProactiveHintsContainer.getLayoutParams();
params.bottomMargin = getHeight() - outRect.bottom - mChipOverhang;
params.width = outRect.width();
}
}
@Override
public PendingAnimation createTaskLauncherAnimation(TaskView tv, long duration) {
PendingAnimation anim = super.createTaskLauncherAnimation(tv, duration);
if (mProactiveHintsContainer != null) {
anim.anim.play(ObjectAnimator.ofFloat(
mProactiveHintsContainer, ProactiveHintsContainer.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 (mProactiveHintsContainer != null) {
anim.anim.play(ObjectAnimator.ofFloat(
mProactiveHintsContainer, ProactiveHintsContainer.HINT_VISIBILITY, 0));
anim.addEndListener(onEndListener -> {
if (!onEndListener.isSuccess) {
mProactiveHintsContainer.setHintVisibility(1);
}
});
}
return anim;
}
public void setHintVisibility(float v) {
if (mProactiveHintsContainer != null) {
mProactiveHintsContainer.setHintVisibility(v);
}
}
@Override
res/layout/launcher.xml
+5
View File
@@ -48,6 +48,11 @@
layout="@layout/overview_panel"
android:visibility="gone" />
<include
android:id="@+id/hints"
layout="@layout/proactive_hints_container"
android:visibility="gone"/>
<!-- Keep these behind the workspace so that they are not visible when
we go into AllApps -->
<com.android.launcher3.pageindicators.WorkspacePageIndicator
res/layout/proactive_hints_container.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<Space
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dp"
android:layout_height="0dp" />
res/values/dimens.xml
+1
View File
@@ -235,6 +235,7 @@
<!-- Hints -->
<dimen name="chip_hint_height">26dp</dimen>
<dimen name="chip_hint_bottom_margin">194dp</dimen>
<dimen name="chip_hint_overhang">15dp</dimen>
<!-- Theming related -->
<dimen name="default_dialog_corner_radius">8dp</dimen>