diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-02 23:08:12 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-02 23:08:12 +0000 |
commit | 2529a66763c7abc8701699d95ab4fa26280b4781 (patch) | |
tree | b9a91b738bf90737942e1834d35fbf4d4e1caf6d | |
parent | 1e74d335d83280b1bc385e6e7004c33281a4ca0d (diff) | |
parent | e9e9d8676e48327ed225bb41806ba468e1e46ed9 (diff) | |
download | Email-2529a66763c7abc8701699d95ab4fa26280b4781.tar.gz |
Snap for 5158751 from e9e9d8676e48327ed225bb41806ba468e1e46ed9 to pi-b4s4-releaseandroid-9.0.0_r39android-9.0.0_r38pie-b4s4-release
Change-Id: I73f69debe710cd5e4851fed0fc4aea3070f4d5db
-rw-r--r-- | AndroidManifest.xml | 15 | ||||
-rw-r--r-- | src/com/android/email/activity/ComposeActivityEmailExternal.java | 32 |
2 files changed, 46 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bbe02d4ae..ae130648d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -89,7 +89,7 @@ <uses-library android:name="org.apache.http.legacy" android:required="false" /> <activity - android:name="com.android.email.activity.ComposeActivityEmail" + android:name="com.android.email.activity.ComposeActivityEmailExternal" android:label="@string/app_name" android:documentLaunchMode="intoExisting" android:autoRemoveFromRecents="true" @@ -144,6 +144,19 @@ <data android:scheme="mailto" /> </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:documentLaunchMode="intoExisting" + android:autoRemoveFromRecents="true" + android:theme="@style/ComposeTheme"> <intent-filter> <action android:name="com.android.mail.intent.action.LAUNCH_COMPOSE" /> <category android:name="android.intent.category.DEFAULT" /> 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; + } +} |