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

Rename AccountSettings to EmailPreferenceActivity 

Change-Id: I972cdae394081b5ec028c38b9274e64ef5822d4a
This commit is contained in:
Tony Mantler 2014-07-14 11:44:52 -07:00
parent bb391e8018
commit 8f5ca5a790
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -273,7 +273,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".activity.setup.AccountSettings" android:name=".activity.setup.EmailPreferenceActivity"
android:label="@string/settings_activity_title" android:label="@string/settings_activity_title"
android:exported="false" > android:exported="false" >
<intent-filter> <intent-filter>

4
src/com/android/email/EmailApplication.java
View File

@ -20,7 +20,7 @@ import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.android.email.activity.setup.AccountSettings; import com.android.email.activity.setup.EmailPreferenceActivity;
import com.android.email.preferences.EmailPreferenceMigrator; import com.android.email.preferences.EmailPreferenceMigrator;
import com.android.mail.browse.ConversationMessage; import com.android.mail.browse.ConversationMessage;
import com.android.mail.browse.InlineAttachmentViewIntentBuilder; import com.android.mail.browse.InlineAttachmentViewIntentBuilder;
@ -60,6 +60,6 @@ public class EmailApplication extends Application {
} }
}); });
PublicPreferenceActivity.sPreferenceActivityClass = AccountSettings.class; PublicPreferenceActivity.sPreferenceActivityClass = EmailPreferenceActivity.class;
} }
} }

2
src/com/android/email/activity/setup/AccountSettings.java → src/com/android/email/activity/setup/EmailPreferenceActivity.java
View File

@ -43,7 +43,7 @@ import java.util.List;
* DebugFragment * DebugFragment
* *
*/ */
public class AccountSettings extends MailPreferenceActivity { public class EmailPreferenceActivity extends MailPreferenceActivity {
/* /*
* Intent to open account settings for account=1 * Intent to open account settings for account=1
adb shell am start -a android.intent.action.EDIT \ adb shell am start -a android.intent.action.EDIT \

9
tests/src/com/android/email/activity/setup/AccountSettingsTests.java → tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
View File

@ -40,7 +40,8 @@ import java.net.URISyntaxException;
*/ */
@Suppress @Suppress
@MediumTest @MediumTest
public class AccountSettingsTests extends ActivityInstrumentationTestCase2<AccountSettings> { public class EmailPreferenceActivityTests
extends ActivityInstrumentationTestCase2<EmailPreferenceActivity> {
private long mAccountId; private long mAccountId;
private Account mAccount; private Account mAccount;
@ -50,8 +51,8 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
private static final String PREFERENCE_FREQUENCY = "account_check_frequency"; private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
public AccountSettingsTests() { public EmailPreferenceActivityTests() {
super(AccountSettings.class); super(EmailPreferenceActivity.class);
} }
/** /**
@ -124,7 +125,7 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
* Get the activity (which causes it to be started, using our intent) and get the UI fields * Get the activity (which causes it to be started, using our intent) and get the UI fields
*/ */
private void getActivityAndFields() throws Throwable { private void getActivityAndFields() throws Throwable {
final AccountSettings theActivity = getActivity(); final EmailPreferenceActivity theActivity = getActivity();
runTestOnUiThread(new Runnable() { runTestOnUiThread(new Runnable() {
public void run() { public void run() {