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

am 31e25767: Follow API changes.

Browse Source 
* commit '31e25767918193217c884db72aaa98e50a4957d3':
  Follow API changes.
This commit is contained in:
Dianne Hackborn 2011-01-17 20:00:38 -08:00 committed by Android Git Automerger
commit 580da738a4
9 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/email/activity/MailboxListFragment.java
View File

@ -617,7 +617,7 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
// Extract the messageId's to move from the ClipData (set up in MessageListItem)
final long[] messageIds = new long[count];
for (int i = 0; i < count; i++) {
Uri uri = clipData.getItem(i).getUri();
Uri uri = clipData.getItemAt(i).getUri();
String msgNum = uri.getPathSegments().get(1);
long id = Long.parseLong(msgNum);
messageIds[i] = id;

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

@ -591,8 +591,7 @@ public class MessageListFragment extends ListFragment
}
// Create ClipData with the Uri of the message we're long clicking
ClipData data = ClipData.newUri(mActivity.getContentResolver(),
MessageListItem.MESSAGE_LIST_ITEMS_CLIP_LABEL, null,
Message.CONTENT_URI.buildUpon()
MessageListItem.MESSAGE_LIST_ITEMS_CLIP_LABEL, Message.CONTENT_URI.buildUpon()
.appendPath(Long.toString(listItem.mMessageId))
.appendQueryParameter(
EmailProvider.MESSAGE_URI_PARAMETER_MAILBOX_ID,

6
src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
View File

@ -231,7 +231,7 @@ public class AccountCheckSettingsFragment extends Fragment {
if (fm.findFragmentByTag(SecurityRequiredDialog.TAG) == null) {
SecurityRequiredDialog securityRequiredDialog =
SecurityRequiredDialog.newInstance(this, mErrorMessage);
fm.openTransaction()
fm.beginTransaction()
.add(securityRequiredDialog, SecurityRequiredDialog.TAG)
.commit();
}
@ -244,7 +244,7 @@ public class AccountCheckSettingsFragment extends Fragment {
if (fm.findFragmentByTag(ErrorDialog.TAG) == null) {
ErrorDialog errorDialog =
ErrorDialog.newInstance(this, mErrorStringId, mErrorMessage);
fm.openTransaction()
fm.beginTransaction()
.add(errorDialog, ErrorDialog.TAG)
.commit();
}
@ -265,7 +265,7 @@ public class AccountCheckSettingsFragment extends Fragment {
if (mCheckingDialog == null) {
mCheckingDialog = CheckingDialog.newInstance(this, mState);
fm.openTransaction()
fm.beginTransaction()
.add(mCheckingDialog, CheckingDialog.TAG)
.commit();
} else {

2
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -546,7 +546,7 @@ public class AccountSettingsFragment extends PreferenceFragment {
public boolean onPreferenceClick(Preference preference) {
DeleteAccountFragment dialogFragment = DeleteAccountFragment.newInstance(
mAccount, AccountSettingsFragment.this);
FragmentTransaction ft = getFragmentManager().openTransaction();
FragmentTransaction ft = getFragmentManager().beginTransaction();
ft.addToBackStack(null);
dialogFragment.show(ft, DeleteAccountFragment.TAG);
return true;

2
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -484,7 +484,7 @@ public class AccountSetupBasics extends AccountSetupActivity
AccountCheckSettingsFragment checkerFragment =
AccountCheckSettingsFragment.newInstance(
SetupData.CHECK_INCOMING | SetupData.CHECK_OUTGOING, null);
FragmentTransaction transaction = getFragmentManager().openTransaction();
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.add(checkerFragment, AccountCheckSettingsFragment.TAG);
transaction.addToBackStack("back");
transaction.commit();

2
src/com/android/email/activity/setup/AccountSetupExchange.java
View File

@ -182,7 +182,7 @@ public class AccountSetupExchange extends AccountSetupActivity
public void onProceedNext(int checkMode, AccountServerBaseFragment target) {
AccountCheckSettingsFragment checkerFragment =
AccountCheckSettingsFragment.newInstance(checkMode, target);
FragmentTransaction transaction = getFragmentManager().openTransaction();
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.add(checkerFragment, AccountCheckSettingsFragment.TAG);
transaction.addToBackStack("back");
transaction.commit();

2
src/com/android/email/activity/setup/AccountSetupIncoming.java
View File

@ -87,7 +87,7 @@ public class AccountSetupIncoming extends AccountSetupActivity
public void onProceedNext(int checkMode, AccountServerBaseFragment target) {
AccountCheckSettingsFragment checkerFragment =
AccountCheckSettingsFragment.newInstance(checkMode, target);
FragmentTransaction transaction = getFragmentManager().openTransaction();
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.add(checkerFragment, AccountCheckSettingsFragment.TAG);
transaction.addToBackStack("back");
transaction.commit();

2
src/com/android/email/activity/setup/AccountSetupOutgoing.java
View File

@ -87,7 +87,7 @@ public class AccountSetupOutgoing extends Activity
public void onProceedNext(int checkMode, AccountServerBaseFragment target) {
AccountCheckSettingsFragment checkerFragment =
AccountCheckSettingsFragment.newInstance(checkMode, target);
FragmentTransaction transaction = getFragmentManager().openTransaction();
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.add(checkerFragment, AccountCheckSettingsFragment.TAG);
transaction.addToBackStack("back");
transaction.commit();

4
src/com/android/email/data/ThrottlingCursorLoader.java
View File

@ -81,10 +81,10 @@ public class ThrottlingCursorLoader extends CursorLoader {
}
@Override
public void onCancelled(Cursor cursor) {
public void onCanceled(Cursor cursor) {
if (Throttle.DEBUG) debugLog("onCancelled");
mThrottle.cancelScheduledCallback();
super.onCancelled(cursor);
super.onCanceled(cursor);
}
@Override