Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de18647f authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

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

parents ded87e65 11b5f605

src/com/android/launcher3/AppWidgetResizeFrame.java

+11 −2
Original line number Diff line number Diff line
@@ -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);

    }

}

src/com/android/launcher3/FocusHelper.java

deleted100644 → 0
+0 −567

File deleted.

Preview size limit exceeded, changes collapsed.

src/com/android/launcher3/util/FocusLogic.java

deleted100644 → 0
+0 −553

File deleted.

Preview size limit exceeded, changes collapsed.