commit 661c908e4e26c99adc2cab7558a02129eaee059d
author Adam Powell <adamp@google.com> Fri Jul 02 10:09:44 2010 -0700
committer Adam Powell <adamp@google.com> Thu Jul 08 10:38:31 2010 -0700
tree e567b318956af77368393f90e5a57519b7581e46
parent 31a4dbf5ca26826061a2a623e51b2721674ea64d

ActionBar tab mode using fragments; needs styles.

Change-Id: I8f931dae447e7b64de827d3c17766e5f8ad794e2

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 8825b8c..4166b89 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1676,11 +1676,11 @@
      */
     private void initActionBar() {
         Window window = getWindow();
-        if (!window.hasFeature(Window.FEATURE_ACTION_BAR)) {
+        if (!window.hasFeature(Window.FEATURE_ACTION_BAR) || mActionBar != null) {
             return;
         }
         
-        mActionBar = new ActionBarImpl(getWindow().getDecorView());
+        mActionBar = new ActionBarImpl(this);
     }
     
     /**