From 06415a635f5f01d8e1620b29f44d68dc4dfdf435 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Wed, 25 Jun 2014 13:23:21 -0700 Subject: Unify settings activity b/9566150 - Install PublicPreferenceActivity - Create AccountServerSettingsActivity to contain all the crazy logic we don't want in AccountSettings - Add restoreAccountWithAddress to Account - Refactor almost everything out of AccountSettings - Tidy the QuickResponse fragment - Majorly refactor the AccountSettingsFragment to decouple it from the activity, and make it save settings immediately instead of when pausing - Move login warning dialog to AccountSettingsFragment - Tweak HeadlessAccountSettingsLoader Change-Id: Ie69181d968b9c3e5940cfef9690b1f5c70e21aa8 --- .../src/com/android/emailcommon/provider/Account.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'emailcommon') diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java index 54e12e8a9..035b7ac55 100755 --- a/emailcommon/src/com/android/emailcommon/provider/Account.java +++ b/emailcommon/src/com/android/emailcommon/provider/Account.java @@ -215,6 +215,23 @@ public final class Account extends EmailContent implements Parcelable { Account.CONTENT_URI, Account.CONTENT_PROJECTION, id, observer); } + public static Account restoreAccountWithAddress(Context context, String emailAddress) { + return restoreAccountWithAddress(context, emailAddress, null); + } + + public static Account restoreAccountWithAddress(Context context, String emailAddress, + ContentObserver observer) { + final Cursor c = context.getContentResolver().query(CONTENT_URI, + new String[] {AccountColumns._ID}, + AccountColumns.EMAIL_ADDRESS + "=?", new String[] {emailAddress}, + null); + if (c == null || !c.moveToFirst()) { + return null; + } + final long id = c.getLong(c.getColumnIndex(AccountColumns._ID)); + return restoreAccountWithId(context, id, observer); + } + @Override protected Uri getContentNotificationUri() { return Account.CONTENT_URI; @@ -323,6 +340,7 @@ public final class Account extends EmailContent implements Parcelable { return mSignature; } + @VisibleForTesting public void setSignature(String signature) { mSignature = signature; } -- cgit v1.2.3