diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-23 21:29:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-23 21:29:41 +0000 |
commit | d5377ca4b331e4db72fcb51a7c0791ff5a1d6e02 (patch) | |
tree | d58ba5b362d50432fe82fc6d6c8f631f24619925 | |
parent | bb5d42d11c6a782acc1ff5a04037b2501d587c62 (diff) | |
parent | e598699dc510d9f69b05554aa482107ed24bc9ba (diff) | |
download | android_packages_apps_Trebuchet-d5377ca4b331e4db72fcb51a7c0791ff5a1d6e02.tar.gz android_packages_apps_Trebuchet-d5377ca4b331e4db72fcb51a7c0791ff5a1d6e02.tar.bz2 android_packages_apps_Trebuchet-d5377ca4b331e4db72fcb51a7c0791ff5a1d6e02.zip |
Merge "Remove custom focus logic" into ub-launcher3-edmonton
-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)); |