From 4e6a976c2d85f7261ae4318a9ccffd2440f73124 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 9 May 2011 11:56:34 -0700 Subject: Adding keyboard focus support for phones. Change-Id: I2daab961d0727bc5d892db6b50ad0f51fe23873c --- src/com/android/launcher2/PagedViewWidget.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/com/android/launcher2/PagedViewWidget.java') diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index 46bf532b4..41473c336 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -255,14 +255,24 @@ public class PagedViewWidget extends LinearLayout implements Checkable { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) - || super.onKeyDown(keyCode, event); + if (LauncherApplication.isScreenXLarge()) { + return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) + || super.onKeyDown(keyCode, event); + } else { + return FocusHelper.handlePagedViewGridLayoutWidgetKeyEvent(this, keyCode, event) + || super.onKeyDown(keyCode, event); + } } @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) - || super.onKeyUp(keyCode, event); + if (LauncherApplication.isScreenXLarge()) { + return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) + || super.onKeyUp(keyCode, event); + } else { + return FocusHelper.handlePagedViewGridLayoutWidgetKeyEvent(this, keyCode, event) + || super.onKeyUp(keyCode, event); + } } @Override -- cgit v1.2.3