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

Merge "Show "Send outgoing mesasges" button in outbox."

Browse Source
This commit is contained in:
Makoto Onuki 2010-08-18 14:24:05 -07:00 committed by Android (Google) Code Review
commit e112bd7648
3 changed files with 103 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
res/layout/message_list_fragment.xml Normal file
View File

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!--
The default ListFragment layout (include) + the "send outgoing message" button.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:id="@+id/send_panel"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
>
<Button
android:id="@+id/send_messages"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/message_list_send_pending_messages_action" />
</LinearLayout>
<include layout="@android:layout/list_content" />
</LinearLayout>

5
src/com/android/email/RefreshManager.java
View File

@ -44,6 +44,9 @@ import java.util.HashMap;
* already being refreshed.
*
* <p>Conceptually it can be a part of {@link Controller}, but extracted for easy testing.
*
* (All public method musb be called on the UI thread. All callbacks will be called on the UI
* thread.)
*/
public class RefreshManager {
private static final boolean DEBUG_CALLBACK_LOG = true;
@ -241,6 +244,8 @@ public class RefreshManager {
/**
* Call {@link #sendPendingMessages} for all accounts.
*
* FIXME: This will end up calling callbacks in a worker thread.
*/
public void sendPendingMessagesForAllAccounts() {
Log.i(Email.LOG_TAG, "sendPendingMessagesForAllAccounts");

73
src/com/android/email/activity/MessageListFragment.java
View File

@ -18,8 +18,8 @@ package com.android.email.activity;
import com.android.email.Controller;
import com.android.email.Email;
import com.android.email.RefreshManager;
import com.android.email.R;
import com.android.email.RefreshManager;
import com.android.email.Utility;
import com.android.email.data.MailboxAccountLoader;
import com.android.email.provider.EmailContent;
@ -37,13 +37,17 @@ import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.ActionMode;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener;
import android.widget.Button;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@ -67,7 +71,8 @@ import java.util.Set;
* TODO Add "send all messages" button to outboxes
*/
public class MessageListFragment extends ListFragment
implements OnItemClickListener, OnItemLongClickListener, MessagesAdapter.Callback {
implements OnItemClickListener, OnItemLongClickListener, MessagesAdapter.Callback,
OnClickListener {
private static final int LOADER_ID_MAILBOX_LOADER = 1;
private static final int LOADER_ID_MESSAGES_LOADER = 2;
@ -79,6 +84,7 @@ public class MessageListFragment extends ListFragment
private View mListFooterView;
private TextView mListFooterText;
private View mListFooterProgress;
private View mSendPanel;
private static final int LIST_FOOTER_MODE_NONE = 0;
private static final int LIST_FOOTER_MODE_MORE = 2;
@ -160,6 +166,16 @@ public class MessageListFragment extends ListFragment
mRefreshManager.registerListener(mRefreshListener);
}
@Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
// Use a custom layout, which includes the original layout with "send messages" panel.
View root = inflater.inflate(R.layout.message_list_fragment,null);
mSendPanel = root.findViewById(R.id.send_panel);
((Button) mSendPanel.findViewById(R.id.send_messages)).setOnClickListener(this);
return root;
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
@ -299,19 +315,6 @@ public class MessageListFragment extends ListFragment
return mMailboxId < 0;
}
/**
* @return true if it's an outbox. false otherwise, or the mailbox type is
* unknown yet.
* @deprecated It's used by MessageList to see if we should show a progress
* for sending messages. The logic here means we can't catch
* callbacks while the mailbox type isn't figured out yet. That
* show/hide progress logic isn't working in the way it should
* in the first place, so fix it and remove this method.
*/
public boolean isOutbox() {
return mMailbox == null ? false : (mMailbox.mType == Mailbox.TYPE_OUTBOX);
}
/**
* @return the number of messages that are currently selecteed.
*/
@ -326,6 +329,15 @@ public class MessageListFragment extends ListFragment
return mSelectionMode != null;
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.send_messages:
onSendPendingMessages();
break;
}
}
/**
* Called when a message is clicked.
*/
@ -423,12 +435,23 @@ public class MessageListFragment extends ListFragment
}
}
/**
* @return if it's an outbox or "all outboxes".
*
* TODO make it private. It's only used by MessageList, but the callsite is obsolete.
*/
public boolean isOutbox() {
return (getMailboxId() == Mailbox.QUERY_ALL_OUTBOX)
|| ((mMailbox != null) && (mMailbox.mType == Mailbox.TYPE_OUTBOX));
}
public void onSendPendingMessages() {
RefreshManager rm = RefreshManager.getInstance(mActivity);
if (getMailboxId() == Mailbox.QUERY_ALL_OUTBOX) {
rm.sendPendingMessagesForAllAccounts();
} else if (!isMagicMailbox()) { // Magic boxes don't have a specific account id.
rm.sendPendingMessages(getAccountId());
// rm.sendPendingMessagesForAllAccounts();
Utility.showToast(getActivity(), "STOPSHIP Not implemented");
} else if (mMailbox != null) { // Magic boxes don't have a specific account id.
rm.sendPendingMessages(mMailbox.mId);
}
}
@ -707,10 +730,23 @@ public class MessageListFragment extends ListFragment
}
}
private void hideSendPanel() {
mSendPanel.setVisibility(View.GONE);
}
private void showSendPanelIfNecessary() {
final boolean show =
isOutbox()
&& (mListAdapter != null)
&& (mListAdapter.getCount() > 0);
mSendPanel.setVisibility(show ? View.VISIBLE : View.GONE);
}
private void startLoading() {
// Clear the list. (ListFragment will show the "Loading" animation)
setListAdapter(null);
setListShown(false);
hideSendPanel();
// Start loading...
final LoaderManager lm = getLoaderManager();
@ -804,6 +840,7 @@ public class MessageListFragment extends ListFragment
autoRefreshStaleMailbox();
addFooterView();
updateSelectionMode();
showSendPanelIfNecessary();
}
}