diff options
Diffstat (limited to 'core/java')
7 files changed, 95 insertions, 8 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 7b39efed0c3a..3c361c348ca7 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -3373,6 +3373,12 @@ public class RemoteViews implements Parcelable, Filter { * @hide */ public interface OnViewAppliedListener { + /** + * Callback when the RemoteView has finished inflating, + * but no actions have been applied yet. + */ + default void onViewInflated(View v) {}; + void onViewApplied(View v); void onError(Exception e); @@ -3469,6 +3475,10 @@ public class RemoteViews implements Parcelable, Filter { @Override protected void onPostExecute(ViewTree viewTree) { if (mError == null) { + if (mListener != null) { + mListener.onViewInflated(viewTree.mRoot); + } + try { if (mActions != null) { OnClickHandler handler = mHandler == null diff --git a/core/java/com/android/internal/widget/ImageMessageConsumer.java b/core/java/com/android/internal/widget/ImageMessageConsumer.java new file mode 100644 index 000000000000..01613dcdf3fa --- /dev/null +++ b/core/java/com/android/internal/widget/ImageMessageConsumer.java @@ -0,0 +1,28 @@ +/* + * 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.internal.widget; + +/** + * An interface for the class who will use the {@link ImageResolver} to resolve images. + */ +public interface ImageMessageConsumer { + /** + * Set the custom {@link ImageResolver} other than {@link LocalImageResolver}. + * @param resolver An image resolver that has custom implementation. + */ + void setImageResolver(ImageResolver resolver); +} diff --git a/core/java/com/android/internal/widget/ImageResolver.java b/core/java/com/android/internal/widget/ImageResolver.java new file mode 100644 index 000000000000..45885257ad8d --- /dev/null +++ b/core/java/com/android/internal/widget/ImageResolver.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.internal.widget; + +import android.graphics.drawable.Drawable; +import android.net.Uri; + +/** + * An interface for image resolvers that have custom implementations like cache mechanisms. + */ +public interface ImageResolver { + /** + * Load an image from specified uri. + * @param uri Uri of the target image. + * @return Target image in Drawable. + */ + Drawable loadImage(Uri uri); +} diff --git a/core/java/com/android/internal/widget/LocalImageResolver.java b/core/java/com/android/internal/widget/LocalImageResolver.java index 71d3bb5d6b5c..2302de2cd058 100644 --- a/core/java/com/android/internal/widget/LocalImageResolver.java +++ b/core/java/com/android/internal/widget/LocalImageResolver.java @@ -17,7 +17,6 @@ package com.android.internal.widget; import android.annotation.Nullable; -import android.app.Notification; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/core/java/com/android/internal/widget/MessagingImageMessage.java b/core/java/com/android/internal/widget/MessagingImageMessage.java index 607a3a9ab542..64650a7ebc2f 100644 --- a/core/java/com/android/internal/widget/MessagingImageMessage.java +++ b/core/java/com/android/internal/widget/MessagingImageMessage.java @@ -25,6 +25,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Path; import android.graphics.drawable.Drawable; +import android.net.Uri; import android.util.AttributeSet; import android.util.Log; import android.util.Pools; @@ -57,6 +58,7 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage private int mActualWidth; private int mActualHeight; private boolean mIsIsolated; + private ImageResolver mImageResolver; public MessagingImageMessage(@NonNull Context context) { this(context, null); @@ -96,11 +98,16 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage MessagingMessage.super.setMessage(message); Drawable drawable; try { - drawable = LocalImageResolver.resolveImage(message.getDataUri(), getContext()); + Uri uri = message.getDataUri(); + drawable = mImageResolver != null ? mImageResolver.loadImage(uri) : + LocalImageResolver.resolveImage(uri, getContext()); } catch (IOException | SecurityException e) { e.printStackTrace(); return false; } + if (drawable == null) { + return false; + } int intrinsicHeight = drawable.getIntrinsicHeight(); if (intrinsicHeight == 0) { Log.w(TAG, "Drawable with 0 intrinsic height was returned"); @@ -114,7 +121,7 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage } static MessagingMessage createMessage(MessagingLayout layout, - Notification.MessagingStyle.Message m) { + Notification.MessagingStyle.Message m, ImageResolver resolver) { MessagingLinearLayout messagingLinearLayout = layout.getMessagingLinearLayout(); MessagingImageMessage createdMessage = sInstancePool.acquire(); if (createdMessage == null) { @@ -125,6 +132,7 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage false); createdMessage.addOnLayoutChangeListener(MessagingLayout.MESSAGING_PROPERTY_ANIMATOR); } + createdMessage.setImageResolver(resolver); boolean created = createdMessage.setMessage(m); if (!created) { createdMessage.recycle(); @@ -133,6 +141,10 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage return createdMessage; } + private void setImageResolver(ImageResolver resolver) { + mImageResolver = resolver; + } + @Override protected void onDraw(Canvas canvas) { canvas.save(); diff --git a/core/java/com/android/internal/widget/MessagingLayout.java b/core/java/com/android/internal/widget/MessagingLayout.java index 0f2e9c52add0..07d0d7d91997 100644 --- a/core/java/com/android/internal/widget/MessagingLayout.java +++ b/core/java/com/android/internal/widget/MessagingLayout.java @@ -57,7 +57,7 @@ import java.util.regex.Pattern; * messages and adapts the layout accordingly. */ @RemoteViews.RemoteView -public class MessagingLayout extends FrameLayout { +public class MessagingLayout extends FrameLayout implements ImageMessageConsumer { private static final float COLOR_SHIFT_AMOUNT = 60; /** @@ -95,6 +95,7 @@ public class MessagingLayout extends FrameLayout { private Person mUser; private CharSequence mNameReplacement; private boolean mDisplayImagesAtEnd; + private ImageResolver mImageResolver; public MessagingLayout(@NonNull Context context) { super(context); @@ -167,6 +168,11 @@ public class MessagingLayout extends FrameLayout { bind(newMessages, newHistoricMessages, showSpinner); } + @Override + public void setImageResolver(ImageResolver resolver) { + mImageResolver = resolver; + } + private void addRemoteInputHistoryToMessages( List<Notification.MessagingStyle.Message> newMessages, CharSequence[] remoteInputHistory) { @@ -463,12 +469,12 @@ public class MessagingLayout extends FrameLayout { */ private List<MessagingMessage> createMessages( List<Notification.MessagingStyle.Message> newMessages, boolean historic) { - List<MessagingMessage> result = new ArrayList<>();; + List<MessagingMessage> result = new ArrayList<>(); for (int i = 0; i < newMessages.size(); i++) { Notification.MessagingStyle.Message m = newMessages.get(i); MessagingMessage message = findAndRemoveMatchingMessage(m); if (message == null) { - message = MessagingMessage.createMessage(this, m); + message = MessagingMessage.createMessage(this, m, mImageResolver); } message.setIsHistoric(historic); result.add(message); diff --git a/core/java/com/android/internal/widget/MessagingMessage.java b/core/java/com/android/internal/widget/MessagingMessage.java index 74d0aae3634b..c32d3705bba7 100644 --- a/core/java/com/android/internal/widget/MessagingMessage.java +++ b/core/java/com/android/internal/widget/MessagingMessage.java @@ -33,9 +33,9 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild { String IMAGE_MIME_TYPE_PREFIX = "image/"; static MessagingMessage createMessage(MessagingLayout layout, - Notification.MessagingStyle.Message m) { + Notification.MessagingStyle.Message m, ImageResolver resolver) { if (hasImage(m) && !ActivityManager.isLowRamDeviceStatic()) { - return MessagingImageMessage.createMessage(layout, m); + return MessagingImageMessage.createMessage(layout, m, resolver); } else { return MessagingTextMessage.createMessage(layout, m); } |