ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move reply/replyall/forward spinner to actionbar.

Browse Source 
Bug: 5126487
Change-Id: I56cd8861d6d616d1c4590f06c6f949cd84e5a42b
This commit is contained in:
Ben Komalo 2011-08-08 15:12:30 -07:00
parent 3fdf92c977
commit 547cae3c8e
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/message_compose.xml
View File

@ -28,13 +28,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" android:background="#ededed">
<Spinner
android:id="@+id/action_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
/>
<!-- Not actually editable -->
<TextView
android:id="@+id/from"

50
src/com/android/email/activity/MessageCompose.java
View File

@ -17,6 +17,7 @@
package com.android.email.activity;
import android.app.ActionBar;
import android.app.ActionBar.OnNavigationListener;
import android.app.ActionBar.Tab;
import android.app.ActionBar.TabListener;
import android.app.Activity;
@ -195,7 +196,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
private View mQuotedTextBar;
private CheckBox mIncludeQuotedTextCheckBox;
private WebView mQuotedText;
private Spinner mActionSpinner;
private ActionSpinnerAdapter mActionSpinnerAdapter;
private Controller mController;
@ -730,8 +730,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
mMessageContentView.setOnFocusChangeListener(this);
mActionSpinner = UiUtilities.getViewOrNull(this, R.id.action_spinner);
updateAttachmentContainer();
mToView.requestFocus();
}
@ -1775,11 +1773,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
* Updates UI components that allows the user to switch between reply/reply all/forward.
*/
private void updateActionSelector() {
// Update reply/reply all/forward switcher.
ActionBar actionBar = getActionBar();
if (shouldUseActionTabs()) {
// Tab-based mode switching.
ActionBar actionBar = getActionBar();
if (actionBar.getTabCount() > 0) {
actionBar.removeAllTabs();
}
@ -1787,30 +1783,19 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
createAndAddTab(R.string.reply_all_action, ACTION_REPLY_ALL);
createAndAddTab(R.string.forward_action, ACTION_FORWARD);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
} else {
// Spinner based mode switching.
if (mActionSpinnerAdapter == null) {
mActionSpinnerAdapter = new ActionSpinnerAdapter(this);
mActionSpinner.setAdapter(mActionSpinnerAdapter);
mActionSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
@Override
public void onItemSelected(
AdapterView<?> parent, View view, int position, long id) {
setAction(ActionSpinnerAdapter.getAction(position));
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
// Should not happen.
}
});
actionBar.setListNavigationCallbacks(
mActionSpinnerAdapter, ACTION_SPINNER_LISTENER);
}
int position = mActionSpinnerAdapter.getPosition(mAction);
mActionSpinner.setSelection(position);
mActionSpinner.setVisibility(View.VISIBLE);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
actionBar.setSelectedNavigationItem(
ActionSpinnerAdapter.getActionPosition(mAction));
}
actionBar.setDisplayShowTitleEnabled(false);
}
private final TabListener ACTION_TAB_LISTENER = new TabListener() {
@ -1824,6 +1809,14 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
};
private final OnNavigationListener ACTION_SPINNER_LISTENER = new OnNavigationListener() {
@Override
public boolean onNavigationItemSelected(int itemPosition, long itemId) {
setAction(ActionSpinnerAdapter.getAction(itemPosition));
return true;
}
};
private static class ActionSpinnerAdapter extends ArrayAdapter<String> {
public ActionSpinnerAdapter(final Context context) {
super(context,
@ -1872,6 +1865,17 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
}
public static int getActionPosition(String action) {
if (ACTION_REPLY.equals(action)) {
return 0;
} else if (ACTION_REPLY_ALL.equals(action)) {
return 1;
} else if (ACTION_FORWARD.equals(action)) {
return 2;
}
throw new IllegalArgumentException("Invalid action type for spinner");
}
}
private Tab createAndAddTab(int labelResource, final String action) {