summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-07-31 17:18:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-31 17:18:38 +0000
commit9f5f297331a9d8e4a69160a41a1fdb901cfbdd21 (patch)
treeccf399ad1528d8614f10eda28d18e1e5aaa51f0f
parent0e657ed260111d07ee230d085c6540b5ba12abec (diff)
parent14b3240ecaeb066c6f3fa9cc61d0cc6d5c481c2c (diff)
downloadandroid_packages_apps_Trebuchet-9f5f297331a9d8e4a69160a41a1fdb901cfbdd21.tar.gz
android_packages_apps_Trebuchet-9f5f297331a9d8e4a69160a41a1fdb901cfbdd21.tar.bz2
android_packages_apps_Trebuchet-9f5f297331a9d8e4a69160a41a1fdb901cfbdd21.zip
Merge "Sending onCreate to the callbacks after our call is complete" into ub-launcher3-dorval-polish
-rw-r--r--src/com/android/launcher3/Launcher.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7e9c5a332..3ae4316a9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -464,9 +464,6 @@ public class Launcher extends BaseActivity
setOrientation();
setContentView(mLauncherView);
- if (mLauncherCallbacks != null) {
- mLauncherCallbacks.onCreate(savedInstanceState);
- }
// Listen for broadcasts
IntentFilter filter = new IntentFilter();
@@ -477,6 +474,10 @@ public class Launcher extends BaseActivity
getSystemUiController().updateUiState(SystemUiController.UI_STATE_BASE_WINDOW,
Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText));
+
+ if (mLauncherCallbacks != null) {
+ mLauncherCallbacks.onCreate(savedInstanceState);
+ }
}
@Override