Unifying focus indicator handling for workspace and all-apps
Adding an abstract FocusIndicatorHelper based on FocusIndicatorView
which draws the background instead of using a dummy view.
Change-Id: Id560195323d2ddad8fcd77ba675cf3f4fd4a94ab
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e1d292c..1c94950 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -107,6 +107,7 @@
import com.android.launcher3.dynamicui.ExtractedColors;
import com.android.launcher3.folder.Folder;
import com.android.launcher3.folder.FolderIcon;
+import com.android.launcher3.keyboard.ViewGroupFocusHelper;
import com.android.launcher3.logging.LoggerUtils;
import com.android.launcher3.logging.UserEventDispatcher;
import com.android.launcher3.model.WidgetsModel;
@@ -363,7 +364,7 @@
private UserEventDispatcher mUserEventDispatcher;
- public FocusIndicatorView mFocusHandler;
+ public ViewGroupFocusHelper mFocusHandler;
private boolean mRotationEnabled = false;
@Thunk void setOrientation() {
@@ -1340,8 +1341,9 @@
*/
private void setupViews() {
mLauncherView = findViewById(R.id.launcher);
- mFocusHandler = (FocusIndicatorView) findViewById(R.id.focus_indicator);
mDragLayer = (DragLayer) findViewById(R.id.drag_layer);
+ mFocusHandler = mDragLayer.getFocusIndicatorHelper();
+
mWorkspace = (Workspace) mDragLayer.findViewById(R.id.workspace);
mPageIndicator = (PageIndicatorLine) mDragLayer.findViewById(R.id.page_indicator);