diff options
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index b42a6f7f7..22a34e6c7 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -24,6 +24,7 @@ import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; import android.app.Activity; +import android.app.ActivityManager; import android.app.AlertDialog; import android.app.Dialog; import android.app.SearchManager; @@ -1060,6 +1061,8 @@ public final class Launcher extends Activity void closeSystemDialogs() { getWindow().closeAllPanels(); + /** + * We should remove this code when we remove all the dialog code. try { dismissDialog(DIALOG_CREATE_SHORTCUT); // Unlock the workspace if the dialog was showing @@ -1073,6 +1076,7 @@ public final class Launcher extends Activity } catch (Exception e) { // An exception is thrown if the dialog is not visible, which is fine } + */ // Whatever we were doing is hereby canceled. mWaitingForResult = false; @@ -2981,6 +2985,9 @@ public final class Launcher extends Activity // TEMPORARY: DISABLE CLINGS ON LARGE UI if (LauncherApplication.isScreenLarge()) return; + // disable clings when running in a test harness + if(ActivityManager.isRunningInTestHarness()) return; + // Enable the clings only if they have not been dismissed before SharedPreferences prefs = getSharedPreferences("com.android.launcher2.prefs", Context.MODE_PRIVATE); |