summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-03-31 15:16:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-31 15:16:50 +0000
commitf15d8432074b9267e3713969ac234cc576654f03 (patch)
tree26ce6b406d7c82ccffd9d0c5c576ed39a8598c78
parentcdc5bda4bf8e1747a73f43f9de7d36302e20e83f (diff)
parent804bcbf34295090b28c5a6a374ab464ea2726349 (diff)
downloadandroid_packages_apps_Trebuchet-f15d8432074b9267e3713969ac234cc576654f03.tar.gz
android_packages_apps_Trebuchet-f15d8432074b9267e3713969ac234cc576654f03.tar.bz2
android_packages_apps_Trebuchet-f15d8432074b9267e3713969ac234cc576654f03.zip
am 804bcbf3: am 8440e7ce: Merge "Increase delay before dismissing intro screen (issue 13691305)" into ub-now-mister-ugly
* commit '804bcbf34295090b28c5a6a374ab464ea2726349': Increase delay before dismissing intro screen (issue 13691305)
-rw-r--r--src/com/android/launcher3/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2ad76675a..5bdd7eb33 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -214,7 +214,7 @@ public class Launcher extends Activity
public static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT = 300;
public static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT_FOLDER_CLOSE = 400;
private static final int ON_ACTIVITY_RESULT_ANIMATION_DELAY = 500;
- private static final int ACTIVITY_START_DELAY = 500;
+ private static final int ACTIVITY_START_DELAY = 800;
private static final Object sLock = new Object();
private static int sScreen = DEFAULT_SCREEN;