diff options
-rw-r--r-- | AndroidManifest.xml | 13 | ||||
-rw-r--r-- | src/com/android/email/activity/ComposeActivityEmailExternal.java | 32 |
2 files changed, 44 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6a4bfc7ec..d2fa37dd3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -81,7 +81,7 @@ <meta-data android:name="android.app.default_searchable" android:value="com.android.email2.ui.MailActivityEmail" /> <activity - android:name="com.android.email.activity.ComposeActivityEmail" + android:name="com.android.email.activity.ComposeActivityEmailExternal" android:label="@string/app_name" android:theme="@style/ComposeTheme"> <intent-filter> @@ -135,6 +135,17 @@ </intent-filter> </activity> + <!-- + There are 2 ComposeActivityEmail activities (here and above) because one is listening + for intents broadcasted internally and the other for those broadcasted from external + applications. Refer to b/32068883. + --> + <activity android:name="com.android.email.activity.ComposeActivityEmail" + android:exported="false" + android:label="@string/app_name" + android:theme="@style/ComposeTheme"> + </activity> + <activity-alias android:name="com.android.mail.compose.ComposeActivity" android:targetActivity="com.android.email.activity.ComposeActivityEmail"/> diff --git a/src/com/android/email/activity/ComposeActivityEmailExternal.java b/src/com/android/email/activity/ComposeActivityEmailExternal.java new file mode 100644 index 000000000..455193bea --- /dev/null +++ b/src/com/android/email/activity/ComposeActivityEmailExternal.java @@ -0,0 +1,32 @@ +/** + * Copyright (C) 2018 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. + */ + +package com.android.email.activity; + +/** + * A subclass of {@link ComposeActivityEmail} which is exported for other Android packages to open. + */ +public class ComposeActivityEmailExternal extends ComposeActivityEmail { + + /** + * Only relevant when WebView Compose is enabled. Change this when WebView + * Compose is enabled for Email. + */ + @Override + public boolean isExternal() { + return false; + } +} |