diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-12-12 13:58:22 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2012-12-12 13:58:22 +0100 |
| commit | e3fea30abe9f9f16dbfa5e989e7058842b085b7e (patch) | |
| tree | 06c5bdcb4e8d18d315115a8a0fc414a1d0d64ccc /APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java | |
| parent | a4ea3e65a7feb9175e206b4aa93662bf51457072 (diff) | |
| download | open-keychain-e3fea30abe9f9f16dbfa5e989e7058842b085b7e.tar.gz open-keychain-e3fea30abe9f9f16dbfa5e989e7058842b085b7e.tar.bz2 open-keychain-e3fea30abe9f9f16dbfa5e989e7058842b085b7e.zip | |
Update ActionBarSherlock
Diffstat (limited to 'APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java')
| -rw-r--r-- | APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java index 8340fb591..ab160f836 100644 --- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java +++ b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java @@ -537,6 +537,9 @@ public abstract class ActionBarSherlock { */
public void dispatchDestroy() {}
+ public void dispatchSaveInstanceState(Bundle outState) {}
+
+ public void dispatchRestoreInstanceState(Bundle savedInstanceState) {}
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
@@ -769,7 +772,7 @@ public abstract class ActionBarSherlock { // Make sure that action views can get an appropriate theme.
if (mMenuInflater == null) {
if (getActionBar() != null) {
- mMenuInflater = new MenuInflater(getThemedContext());
+ mMenuInflater = new MenuInflater(getThemedContext(), mActivity);
} else {
mMenuInflater = new MenuInflater(mActivity);
}
|