Andy Wickham
6729f0b950
This will help enable transitions between A-Z apps lists and search results because both can be seen simultaneously and manipulated independently. Some high level items of the refactor: - SearchRecyclerView is added; logic that populated the main (personal) tab with search results was simply redirected to this RV instead. - BaseAllAppsContainerView added isSearching() method. Returns false, and ActivityAllAppsContainerView overrides (as search is handled there). - Renamed BaseRecyclerView to FastScrollRecyclerView to better describe what it does. SearchRecyclerView extends this, but returns false for supportsFastScrolling(). - AlphabeticalAppsList#mAllAppsStore is now optional, so the Search RV doesn't need to store/listen to apps. Note this doesn't affect the predicted app row which is still updated if one of the predicted apps is uninstalled (I tested this). Future work: - Determine why dispatchRestoreInstanceState is not called for BaseAllAppsContainerView. Save is called, e.g. on rotation. Effect of restore not called: rotating while searching goes back to A-Z list. - Keep suggested apps in Header while searching. Currently they are rendered in the SearchRV above search results, as before. - Potentially extract Personal/Work tabs to move independently of header. - AlphabeticalAppsList is a misleading name because it can also contains search results. However, things are pretty intertwined between that and BaseAllAppsAdapter (effectively a circular dependency), so I figured cleaning all that up was out of the immediate scope of this refactor, which is mainly meant to unblock transition work. Bug: 206905515 Test: Manually checked for regressions, ran tests. Change-Id: I4d3757c8a8f9b774956ca6be541dd4fcdad1de13
115 lines
3.5 KiB
Java
115 lines
3.5 KiB
Java
/*
|
|
* Copyright (C) 2020 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.launcher3.allapps;
|
|
|
|
import android.content.Context;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
import android.view.animation.Animation;
|
|
import android.view.animation.AnimationUtils;
|
|
import android.widget.FrameLayout;
|
|
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.Utilities;
|
|
import com.android.launcher3.views.ActivityContext;
|
|
|
|
/**
|
|
* Work profile toggle switch shown at the bottom of AllApps work tab
|
|
*/
|
|
public class WorkEduCard extends FrameLayout implements
|
|
View.OnClickListener,
|
|
Animation.AnimationListener {
|
|
|
|
private final ActivityContext mActivityContext;
|
|
Animation mDismissAnim;
|
|
private int mPosition = -1;
|
|
|
|
public WorkEduCard(Context context) {
|
|
this(context, null, 0);
|
|
}
|
|
|
|
public WorkEduCard(Context context, AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public WorkEduCard(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
super(context, attrs, defStyleAttr);
|
|
mActivityContext = ActivityContext.lookupContext(getContext());
|
|
mDismissAnim = AnimationUtils.loadAnimation(context, android.R.anim.fade_out);
|
|
mDismissAnim.setDuration(500);
|
|
mDismissAnim.setAnimationListener(this);
|
|
}
|
|
|
|
@Override
|
|
protected void onAttachedToWindow() {
|
|
super.onAttachedToWindow();
|
|
mDismissAnim.reset();
|
|
}
|
|
|
|
@Override
|
|
protected void onDetachedFromWindow() {
|
|
super.onDetachedFromWindow();
|
|
mDismissAnim.cancel();
|
|
}
|
|
|
|
@Override
|
|
protected void onFinishInflate() {
|
|
super.onFinishInflate();
|
|
findViewById(R.id.action_btn).setOnClickListener(this);
|
|
MarginLayoutParams lp = ((MarginLayoutParams) findViewById(R.id.wrapper).getLayoutParams());
|
|
lp.width = mActivityContext.getAppsView().getActiveAppsRecyclerView().getTabWidth();
|
|
}
|
|
|
|
@Override
|
|
public void onClick(View view) {
|
|
startAnimation(mDismissAnim);
|
|
Utilities.getPrefs(getContext()).edit().putInt(WorkAdapterProvider.KEY_WORK_EDU_STEP,
|
|
1).apply();
|
|
}
|
|
|
|
@Override
|
|
public void onAnimationEnd(Animation animation) {
|
|
removeCard();
|
|
}
|
|
|
|
@Override
|
|
public void onAnimationRepeat(Animation animation) {
|
|
|
|
}
|
|
|
|
@Override
|
|
public void onAnimationStart(Animation animation) {
|
|
|
|
}
|
|
|
|
private void removeCard() {
|
|
if (mPosition == -1) {
|
|
if (getParent() != null) ((ViewGroup) getParent()).removeView(WorkEduCard.this);
|
|
} else {
|
|
AllAppsRecyclerView rv = mActivityContext.getAppsView().mAH.get(
|
|
ActivityAllAppsContainerView.AdapterHolder.WORK).mRecyclerView;
|
|
rv.getApps().getAdapterItems().remove(mPosition);
|
|
rv.getAdapter().notifyItemRemoved(mPosition);
|
|
}
|
|
}
|
|
|
|
public void setPosition(int position) {
|
|
mPosition = position;
|
|
}
|
|
|
|
}
|