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

Commit 388a6574 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Long-clicking workspace overlay buttons does the same thing as clicking... 

Merge "Long-clicking workspace overlay buttons does the same thing as clicking them." into ub-launcher3-burnaby-polish
parents 1336070b 6b7653d3

src/com/android/launcher3/Launcher.java

+16 −6
Original line number Original line Diff line number Diff line
@@ -1369,38 +1369,48 @@ public class Launcher extends Activity 
        }

        }





        mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel);

        mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel);

        // Long-clicking buttons in the overview panel does the same thing as clicking them.

        OnLongClickListener performClickOnLongClick = new OnLongClickListener() {

            @Override

            public boolean onLongClick(View v) {

                return v.performClick();

            }

        };

        mWidgetsButton = findViewById(R.id.widget_button);

        mWidgetsButton = findViewById(R.id.widget_button);

        mWidgetsButton.setOnClickListener(new OnClickListener() {

        mWidgetsButton.setOnClickListener(new OnClickListener() {

            @Override

            @Override

            public void onClick(View arg0) {

            public void onClick(View view) {

                if (!mWorkspace.isSwitchingState()) {

                if (!mWorkspace.isSwitchingState()) {

                    onClickAddWidgetButton(arg0);

                    onClickAddWidgetButton(view);

                }

                }

            }

            }

        });

        });

        mWidgetsButton.setOnLongClickListener(performClickOnLongClick);

        mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());

        mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());





        View wallpaperButton = findViewById(R.id.wallpaper_button);

        View wallpaperButton = findViewById(R.id.wallpaper_button);

        wallpaperButton.setOnClickListener(new OnClickListener() {

        wallpaperButton.setOnClickListener(new OnClickListener() {

            @Override

            @Override

            public void onClick(View arg0) {

            public void onClick(View view) {

                if (!mWorkspace.isSwitchingState()) {

                if (!mWorkspace.isSwitchingState()) {

                    onClickWallpaperPicker(arg0);

                    onClickWallpaperPicker(view);

                }

                }

            }

            }

        });

        });

        wallpaperButton.setOnLongClickListener(performClickOnLongClick);

        wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());

        wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());





        View settingsButton = findViewById(R.id.settings_button);

        View settingsButton = findViewById(R.id.settings_button);

        if (hasSettings()) {

        if (hasSettings()) {

            settingsButton.setOnClickListener(new OnClickListener() {

            settingsButton.setOnClickListener(new OnClickListener() {

                @Override

                @Override

                public void onClick(View arg0) {

                public void onClick(View view) {

                    if (!mWorkspace.isSwitchingState()) {

                    if (!mWorkspace.isSwitchingState()) {

                        onClickSettingsButton(arg0);

                        onClickSettingsButton(view);

                    }

                    }

                }

                }

            });

            });

            settingsButton.setOnLongClickListener(performClickOnLongClick);

            settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());

            settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());

        } else {

        } else {

            settingsButton.setVisibility(View.GONE);

            settingsButton.setVisibility(View.GONE);