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

Commit eb5f5f78 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable FolderNameEditText on Taskbar" into sc-v2-dev

parents 2ccfa02f d3457518

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+8 −0
Original line number Diff line number Diff line
@@ -216,6 +216,14 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        return mViewCache;

    }



    @Override

    public boolean supportsIme() {

        // Currently we don't support IME because we have FLAG_NOT_FOCUSABLE. We can remove that

        // flag when opening a floating view that needs IME (such as Folder), but then that means

        // Taskbar will be below IME and thus users can't click the back button.

        return false;

    }



    /**

     * Sets a new data-source for this taskbar instance

     */

src/com/android/launcher3/folder/Folder.java

+13 −9
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo 
        mPageIndicator = findViewById(R.id.folder_page_indicator);

        mFolderName = findViewById(R.id.folder_name);

        mFolderName.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp.folderLabelTextSizePx);

        if (mActivityContext.supportsIme()) {

            mFolderName.setOnBackKeyListener(this);

            mFolderName.setOnFocusChangeListener(this);

            mFolderName.setOnEditorActionListener(this);
@@ -285,6 +286,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo 
                    | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS

                    | InputType.TYPE_TEXT_FLAG_CAP_WORDS);

            mFolderName.forceDisableSuggestions(true);

        } else {

            mFolderName.setEnabled(false);

        }



        mFooter = findViewById(R.id.folder_footer);

        mFooterHeight = getResources().getDimensionPixelSize(R.dimen.folder_label_height);

src/com/android/launcher3/views/ActivityContext.java

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,13 @@ public interface ActivityContext { 
        return StatsLogManager.newInstance((Context) this);

    }



    /**

     * Returns whether we can show the IME for elements hosted by this ActivityContext.

     */

    default boolean supportsIme() {

        return true;

    }



    /**

     * Returns the ActivityContext associated with the given Context.

     */