Merge "small refactor" into jb-ub-mail
diff --git a/res/layout/actionbar_view.xml b/res/layout/actionbar_view.xml
index eae0e18..6ad47ca 100644
--- a/res/layout/actionbar_view.xml
+++ b/res/layout/actionbar_view.xml
@@ -20,8 +20,7 @@
The custom action bar view Gmail uses (containing drop down account spinner,
label, and subject).
-->
-<com.android.mail.ui.ActionBarView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:email="http://schemas.android.com/apk/res/com.android.mail"
+<com.android.mail.ui.MailActionBarView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
@@ -30,4 +29,4 @@
<include layout="@layout/actionbar_subject" />
-</com.android.mail.ui.ActionBarView>
+</com.android.mail.ui.MailActionBarView>
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 9937923..ffc2619 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -119,7 +119,7 @@
protected Account mAccount;
private Folder mFolder;
- protected ActionBarView mActionBarView;
+ protected MailActionBarView mActionBarView;
protected final RestrictedActivity mActivity;
protected final Context mContext;
private final FragmentManager mFragmentManager;
@@ -304,7 +304,7 @@
// be sure to inherit from the ActionBar theme when inflating
final LayoutInflater inflater = LayoutInflater.from(actionBar.getThemedContext());
- mActionBarView = (ActionBarView) inflater.inflate(R.layout.actionbar_view, null);
+ mActionBarView = (MailActionBarView) inflater.inflate(R.layout.actionbar_view, null);
// Why have a different variable for the same thing? We should apply
// the same actions
// on mActionBarView instead.
diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
similarity index 98%
rename from src/com/android/mail/ui/ActionBarView.java
rename to src/com/android/mail/ui/MailActionBarView.java
index c8681cb..e50e4b3 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -51,11 +51,12 @@
import com.android.mail.utils.Utils;
/**
- * View to manage the various states of the Mail Action Bar
+ * View to manage the various states of the Mail Action Bar.
+ * <p>
+ * This also happens to be the custom view we supply to ActionBar.
*
- * TODO(viki): Include ConversationSubjectDisplayer here as well.
*/
-public final class ActionBarView extends LinearLayout implements OnNavigationListener,
+public final class MailActionBarView extends LinearLayout implements OnNavigationListener,
ViewMode.ModeChangeListener, OnQueryTextListener, OnSuggestionListener,
MenuItem.OnActionExpandListener, SubjectDisplayChanger {
private ActionBar mActionBar;
@@ -103,15 +104,15 @@
private boolean mIgnoreFirstNavigation = true;
private final boolean mShowConversationSubject;
- public ActionBarView(Context context) {
+ public MailActionBarView(Context context) {
this(context, null);
}
- public ActionBarView(Context context, AttributeSet attrs) {
+ public MailActionBarView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
- public ActionBarView(Context context, AttributeSet attrs, int defStyle) {
+ public MailActionBarView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
mShowConversationSubject = getResources().getBoolean(R.bool.show_conversation_subject);