Refactored contextual modes out of action bar.
Change-Id: I1fc1c9383e5ee90f135b92a5afa8eadbf1c13d20
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 1cdd423..3298208 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -662,7 +662,7 @@
/*package*/ boolean mWindowAdded = false;
/*package*/ boolean mVisibleFromServer = false;
/*package*/ boolean mVisibleFromClient = true;
- /*package*/ ActionBar mActionBar = null;
+ /*package*/ ActionBarImpl mActionBar = null;
private CharSequence mTitle;
private int mTitleColor = 0;
@@ -4253,4 +4253,19 @@
}
}
}
+
+ @Override
+ public ContextualMode startContextualMode(ContextualMode.Callback callback) {
+ if (mActionBar == null) {
+ return null;
+ }
+ return mActionBar.startContextualMode(callback);
+ }
+
+ @Override
+ public void finishContextualMode() {
+ if (mActionBar != null) {
+ mActionBar.finishContextualMode();
+ }
+ }
}