Merge pull request JakeWharton#760 from SimonVT/issue-623

Init the action bar during findViewById
cberkhoff · Dec 27, 2012 · d5e5d5e · d5e5d5e
2 parents c911c0b + dfa1796
commit d5e5d5e
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 0 deletions.
diff --git a/library/src/com/actionbarsherlock/ActionBarSherlock.java b/library/src/com/actionbarsherlock/ActionBarSherlock.java
@@ -791,4 +791,9 @@ public MenuInflater getMenuInflater() {
      * @see ActionMode
      */
     public abstract ActionMode startActionMode(ActionMode.Callback callback);
+
+    /**
+     * Ensure that the action bar is attached.
+     */
+    public void ensureActionBar() {}
 }
diff --git a/library/src/com/actionbarsherlock/app/SherlockActivity.java b/library/src/com/actionbarsherlock/app/SherlockActivity.java
@@ -243,6 +243,12 @@ public void requestWindowFeature(long featureId) {
         getSherlock().requestFeature((int)featureId);
     }
 
+    @Override
+    public View findViewById(int id) {
+        getSherlock().ensureActionBar();
+        return super.findViewById(id);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
@@ -232,6 +232,12 @@ public void requestWindowFeature(long featureId) {
         getSherlock().requestFeature((int)featureId);
     }
 
+    @Override
+    public View findViewById(int id) {
+        getSherlock().ensureActionBar();
+        return super.findViewById(id);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
@@ -276,6 +276,12 @@ public void requestWindowFeature(long featureId) {
         getSherlock().requestFeature((int)featureId);
     }
 
+    @Override
+    public View findViewById(int id) {
+        getSherlock().ensureActionBar();
+        return super.findViewById(id);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockListActivity.java b/library/src/com/actionbarsherlock/app/SherlockListActivity.java
@@ -243,6 +243,12 @@ public void requestWindowFeature(long featureId) {
         getSherlock().requestFeature((int)featureId);
     }
 
+    @Override
+    public View findViewById(int id) {
+        getSherlock().ensureActionBar();
+        return super.findViewById(id);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
@@ -243,6 +243,12 @@ public void requestWindowFeature(long featureId) {
         getSherlock().requestFeature((int)featureId);
     }
 
+    @Override
+    public View findViewById(int id) {
+        getSherlock().ensureActionBar();
+        return super.findViewById(id);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
@@ -1200,4 +1200,13 @@ public void onDestroyActionMode(ActionMode mode) {
             mActionMode = null;
         }
     }
+
+    @Override
+    public void ensureActionBar() {
+        if (DEBUG) Log.d(TAG, "[ensureActionBar]");
+
+        if (mDecor == null) {
+            initActionBar();
+        }
+    }
 }