diff options
| author | Ray Chen <raychen@google.com> | 2014-08-19 09:16:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 04:36:37 +0000 |
| commit | 312c08bba7c547159764ae25b9c5aecbb63bde86 (patch) | |
| tree | 54a719e4dc993441e5a0bfa5b85edf185ac6b2c0 /src | |
| parent | ab85f9eda57c289d1f2f7352873dfdeaf3ea4098 (diff) | |
| parent | 1b8d42f7d1711664a0bb0de0a8585ada6c24ffad (diff) | |
| download | android_packages_apps_UnifiedEmail-312c08bba7c547159764ae25b9c5aecbb63bde86.tar.gz android_packages_apps_UnifiedEmail-312c08bba7c547159764ae25b9c5aecbb63bde86.tar.bz2 android_packages_apps_UnifiedEmail-312c08bba7c547159764ae25b9c5aecbb63bde86.zip | |
Merge "Allows subclassing showHelp from EmlViewerActivity" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/browse/MessageAttachmentBar.java | 2 | ||||
| -rw-r--r-- | src/com/android/mail/ui/AccountFeedbackActivity.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/mail/browse/MessageAttachmentBar.java b/src/com/android/mail/browse/MessageAttachmentBar.java index c7121b2e0..91c63ba1d 100644 --- a/src/com/android/mail/browse/MessageAttachmentBar.java +++ b/src/com/android/mail/browse/MessageAttachmentBar.java @@ -343,7 +343,7 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener // For EML files, we want to open our dedicated // viewer rather than let any activity open it. if (MimeType.isEmlMimeType(contentType)) { - intent.setClass(getContext().getApplicationContext(), EmlViewerActivity.class); + intent.setPackage(getContext().getPackageName()); intent.putExtra(AccountFeedbackActivity.EXTRA_ACCOUNT_URI, mAccount != null ? mAccount.uri : null); } diff --git a/src/com/android/mail/ui/AccountFeedbackActivity.java b/src/com/android/mail/ui/AccountFeedbackActivity.java index 1567b4b20..89a736d37 100644 --- a/src/com/android/mail/ui/AccountFeedbackActivity.java +++ b/src/com/android/mail/ui/AccountFeedbackActivity.java @@ -114,7 +114,7 @@ public abstract class AccountFeedbackActivity extends ActionBarActivity } else if (itemId == R.id.settings) { Utils.showSettings(this, mAccount); } else if (itemId == R.id.help_info_menu_item) { - Utils.showHelp(this, mAccount, getString(R.string.main_help_context)); + showHelp(getString(R.string.main_help_context)); } else { return super.onOptionsItemSelected(item); } @@ -126,4 +126,8 @@ public abstract class AccountFeedbackActivity extends ActionBarActivity public Account getAccount() { return mAccount; } + + protected void showHelp(String helpContext) { + Utils.showHelp(this, mAccount, helpContext); + } } |