openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am aad5ef44: Fix issues with how the gestures pad was hidden when leaving Home. 

Merge commit 'aad5ef44c665fc4ce143a61c009dc04be3ab0437'

* commit 'aad5ef44c665fc4ce143a61c009dc04be3ab0437':
  Fix issues with how the gestures pad was hidden when leaving Home.
This commit is contained in:
Romain Guy 2009-06-10 07:44:36 -07:00 committed by The Android Open Source Project
parent bbeb240704 aad5ef44c6
commit c1dd33cadc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/gestures.xml
View File

@ -46,7 +46,7 @@
android:shadowColor="#FF000000" android:shadowColor="#FF000000"
android:shadowRadius="2.0" android:shadowRadius="2.0"
android:drawablePadding="6dip" android:drawablePadding="8dip"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
@ -62,7 +62,7 @@
android:shadowColor="#FF000000" android:shadowColor="#FF000000"
android:shadowRadius="2.0" android:shadowRadius="2.0"
android:drawablePadding="6dip" android:drawablePadding="8dip"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"

10
src/com/android/launcher/Launcher.java
View File

@ -230,6 +230,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
private Launcher.GesturesProcessor mGesturesProcessor; private Launcher.GesturesProcessor mGesturesProcessor;
private Gesture mCurrentGesture; private Gesture mCurrentGesture;
private GesturesAction mGesturesAction; private GesturesAction mGesturesAction;
private boolean mHideGesturesPanel;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -337,6 +338,8 @@ public final class Launcher extends Activity implements View.OnClickListener, On
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mWaitingForResult = false;
// The pattern used here is that a user PICKs a specific application, // The pattern used here is that a user PICKs a specific application,
// which, depending on the target, might need to CREATE the actual target. // 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); mAppWidgetHost.deleteAppWidgetId(appWidgetId);
} }
} }
mWaitingForResult = false;
} }
@Override @Override
@ -417,7 +419,10 @@ public final class Launcher extends Activity implements View.OnClickListener, On
@Override @Override
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
hideGesturesPanel(); if (mHideGesturesPanel) {
mHideGesturesPanel = false;
hideGesturesPanel();
}
} }
@Override @Override
@ -1689,6 +1694,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
} }
void startActivitySafely(Intent intent) { void startActivitySafely(Intent intent) {
mHideGesturesPanel = true;
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try { try {
startActivity(intent); startActivity(intent);