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

Commit e248b837 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Prevent launching Widgets when cycling between Overview/Shrink state... 

Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)" into jb-ub-now-jolly-elf
parents f0f2ffae 8e15fdf6

src/com/android/launcher3/Launcher.java

+9 −3
Original line number Diff line number Diff line
@@ -1191,8 +1191,10 @@ public class Launcher extends Activity 
        widgetButton.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View arg0) {

                if (!mWorkspace.isSwitchingState()) {

                    showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);

                }

            }

        });

        widgetButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1200,8 +1202,10 @@ public class Launcher extends Activity 
        wallpaperButton.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View arg0) {

                if (!mWorkspace.isSwitchingState()) {

                    startWallpaper();

                }

            }

        });

        wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1209,8 +1213,10 @@ public class Launcher extends Activity 
        settingsButton.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View arg0) {

                if (!mWorkspace.isSwitchingState()) {

                    startSettings();

                }

            }

        });

        settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());

        mOverviewPanel.setAlpha(0f);