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

Overlay shouldn't show up above Intro screen 

bug: 18173340
Change-Id: Icf738a55398023ab6bad5cced05b25e053dec0a2
This commit is contained in:
Adam Cohen 2014-10-31 16:15:36 -07:00
parent 3f9c971e76
commit c3e12c733e
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/launcher3/Launcher.java
View File

@ -489,13 +489,6 @@ public class Launcher extends Activity
// On large interfaces, we want the screen to auto-rotate based on the current orientation
unlockScreenOrientation(true);
if (shouldShowIntroScreen()) {
showIntroScreen();
} else {
showFirstRunActivity();
showFirstRunClings();
}
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onCreate(savedInstanceState);
if (mLauncherCallbacks.hasLauncherOverlay()) {
@ -506,6 +499,13 @@ public class Launcher extends Activity
mWorkspace.setLauncherOverlay(mLauncherOverlay);
}
}
if (shouldShowIntroScreen()) {
showIntroScreen();
} else {
showFirstRunActivity();
showFirstRunClings();
}
}
private LauncherCallbacks mLauncherCallbacks;
@ -5260,6 +5260,9 @@ public class Launcher extends Activity
if (introScreen != null) {
mDragLayer.showOverlayView(introScreen);
}
if (mLauncherOverlayContainer != null) {
mLauncherOverlayContainer.setVisibility(View.INVISIBLE);
}
}
public void dismissIntroScreen() {
@ -5271,11 +5274,17 @@ public class Launcher extends Activity
@Override
public void run() {
mDragLayer.dismissOverlayView();
if (mLauncherOverlayContainer != null) {
mLauncherOverlayContainer.setVisibility(View.VISIBLE);
}
showFirstRunClings();
}
}, ACTIVITY_START_DELAY);
} else {
mDragLayer.dismissOverlayView();
if (mLauncherOverlayContainer != null) {
mLauncherOverlayContainer.setVisibility(View.VISIBLE);
}
showFirstRunClings();
}
changeWallpaperVisiblity(true);