diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-23 10:51:37 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-05-23 10:54:18 -0700 |
commit | e598699dc510d9f69b05554aa482107ed24bc9ba (patch) | |
tree | 20ed2b5fcf5f448bc38d1076aae5d21e073ee7bd | |
parent | e26b03388e1e777f6860971cd157852b43ea6ecd (diff) | |
download | android_packages_apps_Trebuchet-e598699dc510d9f69b05554aa482107ed24bc9ba.tar.gz android_packages_apps_Trebuchet-e598699dc510d9f69b05554aa482107ed24bc9ba.tar.bz2 android_packages_apps_Trebuchet-e598699dc510d9f69b05554aa482107ed24bc9ba.zip |
Remove custom focus logic
Using the system logic for focus handling so that partially visible contents are
properly handled, eg in overview only hotseat is visible
This does changes the focus logic on workspace when both icons and widgets or different sizes
are present, we may consider reviving (parts of) this logic in the future
Bug: 80189843
Change-Id: I874e284e0a62b579c24d36db9b74da3de7a7e367
-rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/folder/FolderPagedView.java | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index 1f18ea1ac..466b7b242 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -65,6 +65,9 @@ class FullscreenKeyEventListener implements View.OnKeyListener { } } +/** + * TODO: Reevaluate if this is still required + */ public class FocusHelper { private static final String TAG = "FocusHelper"; diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index c6025fe5f..ee4b1130d 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -112,7 +112,6 @@ public class Hotseat extends FrameLayout implements LogContainerProvider, Insett allAppsButton.setCompoundDrawables(null, d, null, null); allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label)); - allAppsButton.setOnKeyListener(new HotseatIconKeyEventListener()); if (mLauncher != null) { allAppsButton.setOnClickListener((v) -> { if (!mLauncher.isInState(ALL_APPS)) { diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 6631f771c..42e8fde3b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -881,7 +881,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> final CellLayout layout; if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { layout = mLauncher.getHotseat().getLayout(); - child.setOnKeyListener(new HotseatIconKeyEventListener()); // Hide folder title in the hotseat if (child instanceof FolderIcon) { @@ -893,7 +892,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> ((FolderIcon) child).setTextVisible(true); } layout = getScreenWithId(screenId); - child.setOnKeyListener(new IconKeyEventListener()); } ViewGroup.LayoutParams genericLp = child.getLayoutParams(); diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index fa7565adb..9be71f95c 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -31,7 +31,6 @@ import android.view.ViewDebug; import com.android.launcher3.BubbleTextView; import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.FocusHelper.PagedFolderKeyEventListener; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; @@ -88,7 +87,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { private int mGridCountY; private Folder mFolder; - private PagedFolderKeyEventListener mKeyListener; public FolderPagedView(Context context, AttributeSet attrs) { super(context, attrs); @@ -108,7 +106,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { public void setFolder(Folder folder) { mFolder = folder; - mKeyListener = new PagedFolderKeyEventListener(folder); mPageIndicator = folder.findViewById(R.id.folder_page_indicator); initParentViews(folder); } @@ -241,7 +238,6 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> { textView.setOnClickListener(ItemClickHandler.INSTANCE); textView.setOnLongClickListener(mFolder); textView.setOnFocusChangeListener(mFocusIndicatorHelper); - textView.setOnKeyListener(mKeyListener); textView.setLayoutParams(new CellLayout.LayoutParams( item.cellX, item.cellY, item.spanX, item.spanY)); |