commit 2ecfcd9b236e14e0bc88e1c43023f873bf3e6e24
author Adam Powell <adamp@google.com> Sat Jul 12 00:18:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 10 20:49:26 2014 +0000
tree 72b449964fb8a8819b71dc7e73cbbd25081649a7
parent 1f24c7e37bc794057a156a730c7e4b53b01212ed
parent b40484bb30838e2769857f30f439cd0fc5e8223e

Merge "Correctly set the window callback for ToolbarActionBar"

core/java/com/android/internal/app/ToolbarActionBar.java

diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java
index 7af52f3..50effd0 100644
--- a/core/java/com/android/internal/app/ToolbarActionBar.java
+++ b/core/java/com/android/internal/app/ToolbarActionBar.java
@@ -65,6 +65,7 @@
         mToolbar = toolbar;
         mDecorToolbar = new ToolbarWidgetWrapper(toolbar);
         mWindowCallback = windowCallback;
+        mDecorToolbar.setWindowCallback(mWindowCallback);
         toolbar.setOnMenuItemClickListener(mMenuClicker);
         mDecorToolbar.setWindowTitle(title);
     }