diff options
author | Romain Guy <romainguy@android.com> | 2009-06-10 02:48:37 -0700 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2009-06-10 02:48:37 -0700 |
commit | aad5ef44c665fc4ce143a61c009dc04be3ab0437 (patch) | |
tree | a2f1ac02b07f1e197eda3af5ec9246123d525870 /src/com/android/launcher/Launcher.java | |
parent | 73b979d8c141c7ceac82dad7c5b271a6a42afa67 (diff) | |
download | android_packages_apps_Trebuchet-aad5ef44c665fc4ce143a61c009dc04be3ab0437.tar.gz android_packages_apps_Trebuchet-aad5ef44c665fc4ce143a61c009dc04be3ab0437.tar.bz2 android_packages_apps_Trebuchet-aad5ef44c665fc4ce143a61c009dc04be3ab0437.zip |
Fix issues with how the gestures pad was hidden when leaving Home.
Diffstat (limited to 'src/com/android/launcher/Launcher.java')
-rw-r--r-- | src/com/android/launcher/Launcher.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java index 0c54382dc..51b720bcf 100644 --- a/src/com/android/launcher/Launcher.java +++ b/src/com/android/launcher/Launcher.java @@ -230,6 +230,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On private Launcher.GesturesProcessor mGesturesProcessor; private Gesture mCurrentGesture; private GesturesAction mGesturesAction; + private boolean mHideGesturesPanel; @Override protected void onCreate(Bundle savedInstanceState) { @@ -337,6 +338,8 @@ public final class Launcher extends Activity implements View.OnClickListener, On @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + mWaitingForResult = false; + // The pattern used here is that a user PICKs a specific application, // which, depending on the target, might need to CREATE the actual target. @@ -389,7 +392,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On mAppWidgetHost.deleteAppWidgetId(appWidgetId); } } - mWaitingForResult = false; } @Override @@ -417,7 +419,10 @@ public final class Launcher extends Activity implements View.OnClickListener, On @Override protected void onStop() { super.onStop(); - hideGesturesPanel(); + if (mHideGesturesPanel) { + mHideGesturesPanel = false; + hideGesturesPanel(); + } } @Override @@ -1689,6 +1694,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On } void startActivitySafely(Intent intent) { + mHideGesturesPanel = true; intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); try { startActivity(intent); |