Refactor allapps.search package to depend on ActivityContext.
Test: Manual Bug: 216683257 Change-Id: I6230498b24380b37531f8a83db1dc768270e708a
This commit is contained in:
@@ -32,7 +32,6 @@ import android.view.KeyEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup.MarginLayoutParams;
|
||||
|
||||
import com.android.launcher3.BaseDraggingActivity;
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.ExtendedEditText;
|
||||
import com.android.launcher3.Insettable;
|
||||
@@ -43,6 +42,7 @@ import com.android.launcher3.allapps.AlphabeticalAppsList;
|
||||
import com.android.launcher3.allapps.BaseAllAppsAdapter.AdapterItem;
|
||||
import com.android.launcher3.allapps.SearchUiManager;
|
||||
import com.android.launcher3.search.SearchCallback;
|
||||
import com.android.launcher3.views.ActivityContext;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -53,7 +53,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
|
||||
implements SearchUiManager, SearchCallback<AdapterItem>,
|
||||
AllAppsStore.OnUpdateListener, Insettable {
|
||||
|
||||
private final BaseDraggingActivity mLauncher;
|
||||
private final ActivityContext mLauncher;
|
||||
private final AllAppsSearchBarController mSearchBarController;
|
||||
private final SpannableStringBuilder mSearchQueryBuilder;
|
||||
|
||||
@@ -74,7 +74,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
|
||||
public AppsSearchContainerLayout(Context context, AttributeSet attrs, int defStyleAttr) {
|
||||
super(context, attrs, defStyleAttr);
|
||||
|
||||
mLauncher = BaseDraggingActivity.fromContext(context);
|
||||
mLauncher = ActivityContext.lookupContext(context);
|
||||
mSearchBarController = new AllAppsSearchBarController();
|
||||
|
||||
mSearchQueryBuilder = new SpannableStringBuilder();
|
||||
@@ -134,7 +134,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
|
||||
mApps = appsView.getApps();
|
||||
mAppsView = appsView;
|
||||
mSearchBarController.initialize(
|
||||
new DefaultAppSearchAlgorithm(mLauncher),
|
||||
new DefaultAppSearchAlgorithm(getContext()),
|
||||
this, mLauncher, this);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user