commit | 9b4c804b9856d732e461bc7505d40aa4ea1f7bf7 | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Tue Aug 10 15:36:44 2010 -0700 |
committer | Adam Powell <adamp@google.com> | Tue Aug 10 15:36:44 2010 -0700 |
tree | 2c0d24534890e9ebff2cfdd9d3f95d6d2378110e | |
parent | f0cfe3438aea77b5193d94fb9fa0c8d37972b194 [diff] [blame] |
Fix bug 2908823 Change-Id: Ia20d47ff4e2a09cc0e1ac47cd02a5f152f57073c
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index d49adc2..f83f182 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java
@@ -1764,7 +1764,7 @@ */ private void initActionBar() { Window window = getWindow(); - if (!window.hasFeature(Window.FEATURE_ACTION_BAR) || mActionBar != null) { + if (isChild() || !window.hasFeature(Window.FEATURE_ACTION_BAR) || mActionBar != null) { return; }