commit 9f5f297331a9d8e4a69160a41a1fdb901cfbdd21
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 31 17:18:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 31 17:18:38 2017 +0000
tree ccf399ad1528d8614f10eda28d18e1e5aaa51f0f
parent 0e657ed260111d07ee230d085c6540b5ba12abec
parent 14b3240ecaeb066c6f3fa9cc61d0cc6d5c481c2c

Merge "Sending onCreate to the callbacks after our call is complete" into ub-launcher3-dorval-polish

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7e9c5a3..3ae4316 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -464,9 +464,6 @@
         setOrientation();
 
         setContentView(mLauncherView);
-        if (mLauncherCallbacks != null) {
-            mLauncherCallbacks.onCreate(savedInstanceState);
-        }
 
         // Listen for broadcasts
         IntentFilter filter = new IntentFilter();
@@ -477,6 +474,10 @@
 
         getSystemUiController().updateUiState(SystemUiController.UI_STATE_BASE_WINDOW,
                 Themes.getAttrBoolean(this, R.attr.isWorkspaceDarkText));
+
+        if (mLauncherCallbacks != null) {
+            mLauncherCallbacks.onCreate(savedInstanceState);
+        }
     }
 
     @Override