Merge "Removing unused keyboard handling code" into sc-dev

This commit is contained in:
Sunny Goyal
2021-03-10 00:13:27 +00:00
committed by Android (Google) Code Review
3 changed files with 11 additions and 1122 deletions

View File

@@ -26,7 +26,6 @@ import androidx.annotation.Nullable;
import com.android.launcher3.accessibility.DragViewStateAnnouncer;
import com.android.launcher3.dragndrop.DragLayer;
import com.android.launcher3.util.FocusLogic;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.widget.LauncherAppWidgetHostView;
import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
@@ -544,7 +543,7 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
// Clear the frame and give focus to the widget host view when a directional key is pressed.
if (FocusLogic.shouldConsume(keyCode)) {
if (shouldConsume(keyCode)) {
close(false);
mWidgetView.requestFocus();
return true;
@@ -667,4 +666,14 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
return moveEnd ? out.size() - size() : size() - out.size();
}
}
/**
* Returns true only if this utility class handles the key code.
*/
public static boolean shouldConsume(int keyCode) {
return (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT
|| keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN
|| keyCode == KeyEvent.KEYCODE_MOVE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_END
|| keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
}
}