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

Commit 49635c71 authored by Huy Nguyen's avatar Huy Nguyen Committed by Android Git Automerger
Browse files

am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release 

* commit '6cb8ae4c':
  Disabling cling when the user moves the folder before launching it. (Bug 12963868)
parents a4d0ef3c 6cb8ae4c

src/com/android/launcher3/LauncherClings.java

+7 −1
Original line number Diff line number Diff line
@@ -303,6 +303,12 @@ class LauncherClings { 
        editor.commit();

    }



    public void markFolderClingDismissed() {

        SharedPreferences.Editor editor = mLauncher.getSharedPrefs().edit();

        editor.putBoolean(LauncherClings.FOLDER_CLING_DISMISSED_KEY, true);

        editor.apply();

    }



    /** Removes the cling outright from the DragLayer */

    private void removeCling(int id) {

        final View cling = mLauncher.findViewById(id);

src/com/android/launcher3/Workspace.java

+3 −0
Original line number Diff line number Diff line
@@ -2632,6 +2632,9 @@ public class Workspace extends SmoothPagedView 
        if (child instanceof BubbleTextView) {

            BubbleTextView icon = (BubbleTextView) child;

            icon.clearPressedOrFocusedBackground();

        } else if (child instanceof FolderIcon) {

            // Dismiss the folder cling if we haven't already

            mLauncher.getLauncherClings().markFolderClingDismissed();

        }



        if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) {