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

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

Merge "Test Week - Add more coverage for Folder.java" into main

parents f3256e5b f8962a54

src/com/android/launcher3/dragndrop/DragLayer.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -157,7 +157,8 @@ public class DragLayer extends BaseDragLayer<Launcher> implements LauncherOverla 
                        isOverFolderOrSearchBar = isEventOverView(topView, ev) ||

                        isOverFolderOrSearchBar = isEventOverView(topView, ev) ||

                                isEventOverAccessibleDropTargetBar(ev);

                                isEventOverAccessibleDropTargetBar(ev);

                        if (!isOverFolderOrSearchBar) {

                        if (!isOverFolderOrSearchBar) {

                            sendTapOutsideFolderAccessibilityEvent(currentFolder.isEditingName());

                            sendTapOutsideFolderAccessibilityEvent(

                                    currentFolder.getIsEditingName());

                            mHoverPointClosesFolder = true;

                            mHoverPointClosesFolder = true;

                            return true;

                            return true;

                        }

                        }
@@ -167,7 +168,8 @@ public class DragLayer extends BaseDragLayer<Launcher> implements LauncherOverla 
                        isOverFolderOrSearchBar = isEventOverView(topView, ev) ||

                        isOverFolderOrSearchBar = isEventOverView(topView, ev) ||

                                isEventOverAccessibleDropTargetBar(ev);

                                isEventOverAccessibleDropTargetBar(ev);

                        if (!isOverFolderOrSearchBar && !mHoverPointClosesFolder) {

                        if (!isOverFolderOrSearchBar && !mHoverPointClosesFolder) {

                            sendTapOutsideFolderAccessibilityEvent(currentFolder.isEditingName());

                            sendTapOutsideFolderAccessibilityEvent(

                                    currentFolder.getIsEditingName());

                            mHoverPointClosesFolder = true;

                            mHoverPointClosesFolder = true;

                            return true;

                            return true;

                        } else if (!isOverFolderOrSearchBar) {

                        } else if (!isOverFolderOrSearchBar) {

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

+286 −84

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -256,8 +256,8 @@ public class FolderAnimationManager { 
                mFolder.getContent(), contentStart, contentEnd, finalRadius, !mIsOpening));

                mFolder.getContent(), contentStart, contentEnd, finalRadius, !mIsOpening));





        // Fade in the folder name, as the text can overlap the icons when grid size is small.

        // Fade in the folder name, as the text can overlap the icons when grid size is small.

        mFolder.mFolderName.setAlpha(mIsOpening ? 0f : 1f);

        mFolder.getFolderName().setAlpha(mIsOpening ? 0f : 1f);

        play(a, getAnimator(mFolder.mFolderName, View.ALPHA, 0, 1),

        play(a, getAnimator(mFolder.getFolderName(), View.ALPHA, 0, 1),

                mIsOpening ? FOLDER_NAME_ALPHA_DURATION : 0,

                mIsOpening ? FOLDER_NAME_ALPHA_DURATION : 0,

                mIsOpening ? mDuration - FOLDER_NAME_ALPHA_DURATION : FOLDER_NAME_ALPHA_DURATION);

                mIsOpening ? mDuration - FOLDER_NAME_ALPHA_DURATION : FOLDER_NAME_ALPHA_DURATION);
@@ -318,7 +318,7 @@ public class FolderAnimationManager { 
                mFolder.mFooter.setScaleX(1f);

                mFolder.mFooter.setScaleX(1f);

                mFolder.mFooter.setScaleY(1f);

                mFolder.mFooter.setScaleY(1f);

                mFolder.mFooter.setTranslationX(0f);

                mFolder.mFooter.setTranslationX(0f);

                mFolder.mFolderName.setAlpha(1f);

                mFolder.getFolderName().setAlpha(1f);





                mFolder.setClipChildren(mFolderClipChildren);

                mFolder.setClipChildren(mFolderClipChildren);

                mFolder.setClipToPadding(mFolderClipToPadding);

                mFolder.setClipToPadding(mFolderClipToPadding);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -459,7 +459,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 




        mInfo.setTitle(newTitle, mFolder.mLauncherDelegate.getModelWriter());

        mInfo.setTitle(newTitle, mFolder.mLauncherDelegate.getModelWriter());

        onTitleChanged(mInfo.title);

        onTitleChanged(mInfo.title);

        mFolder.mFolderName.setText(mInfo.title);

        mFolder.getFolderName().setText(mInfo.title);





        // Logging for folder creation flow

        // Logging for folder creation flow

        StatsLogManager.newInstance(getContext()).logger()

        StatsLogManager.newInstance(getContext()).logger()

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -373,8 +373,8 @@ public class FolderPagedView extends PagedView<PageIndicatorDots> implements Cli 
        // Update footer

        // Update footer

        mPageIndicator.setVisibility(getPageCount() > 1 ? View.VISIBLE : View.GONE);

        mPageIndicator.setVisibility(getPageCount() > 1 ? View.VISIBLE : View.GONE);

        // Set the gravity as LEFT or RIGHT instead of START, as START depends on the actual text.

        // Set the gravity as LEFT or RIGHT instead of START, as START depends on the actual text.

        mFolder.mFolderName.setGravity(getPageCount() > 1 ?

        mFolder.getFolderName().setGravity(getPageCount() > 1

                (mIsRtl ? Gravity.RIGHT : Gravity.LEFT) : Gravity.CENTER_HORIZONTAL);

                ? (mIsRtl ? Gravity.RIGHT : Gravity.LEFT) : Gravity.CENTER_HORIZONTAL);

    }

    }





    public int getDesiredWidth() {

    public int getDesiredWidth() {