PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tony Wickham
2015-09-04 22:18:38 +00:00
committed by Android (Google) Code Review
parent 1336070b2a 6b7653d37f
commit 388a657419
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+16 -6
View File
@@ -1369,38 +1369,48 @@ public class Launcher extends Activity
}
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.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
public void onClick(View view) {
if (!mWorkspace.isSwitchingState()) {
onClickAddWidgetButton(arg0);
onClickAddWidgetButton(view);
}
}
});
mWidgetsButton.setOnLongClickListener(performClickOnLongClick);
mWidgetsButton.setOnTouchListener(getHapticFeedbackTouchListener());
View wallpaperButton = findViewById(R.id.wallpaper_button);
wallpaperButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
public void onClick(View view) {
if (!mWorkspace.isSwitchingState()) {
onClickWallpaperPicker(arg0);
onClickWallpaperPicker(view);
}
}
});
wallpaperButton.setOnLongClickListener(performClickOnLongClick);
wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
View settingsButton = findViewById(R.id.settings_button);
if (hasSettings()) {
settingsButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
public void onClick(View view) {
if (!mWorkspace.isSwitchingState()) {
onClickSettingsButton(arg0);
onClickSettingsButton(view);
}
}
});
settingsButton.setOnLongClickListener(performClickOnLongClick);
settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());
} else {
settingsButton.setVisibility(View.GONE);