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

am e248b837: Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)" into jb-ub-now-jolly-elf

Browse Source 
* commit 'e248b83797e6b6ce128085560ad0c5b900413bf2':
  Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)
This commit is contained in:
Winson Chung
2013-11-15 08:50:04 -08:00
committed by Android Git Automerger
parent e99951bd94 e248b83797
commit a73c1fac3d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+9 -3
View File
@@ -1191,7 +1191,9 @@ public class Launcher extends Activity
widgetButton.setOnClickListener(new OnClickListener() { widgetButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View arg0) { public void onClick(View arg0) {
showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true); if (!mWorkspace.isSwitchingState()) {
showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
}
} }
}); });
widgetButton.setOnTouchListener(getHapticFeedbackTouchListener()); widgetButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1200,7 +1202,9 @@ public class Launcher extends Activity
wallpaperButton.setOnClickListener(new OnClickListener() { wallpaperButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View arg0) { public void onClick(View arg0) {
startWallpaper(); if (!mWorkspace.isSwitchingState()) {
startWallpaper();
}
} }
}); });
wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener()); wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1209,7 +1213,9 @@ public class Launcher extends Activity
settingsButton.setOnClickListener(new OnClickListener() { settingsButton.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View arg0) { public void onClick(View arg0) {
startSettings(); if (!mWorkspace.isSwitchingState()) {
startSettings();
}
} }
}); });
settingsButton.setOnTouchListener(getHapticFeedbackTouchListener()); settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());