Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d0bd8ac authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Resolve layered ThemeBundle Wallpaper thumbnails

Use a new Asset class to handle wallpaper thumbnails so that
we can handle layered wallpaper thumbnails.

Bug: 136497932
Change-Id: Ib1ef78c6c202cd9c9f3d00a3bdb2974e627470ea
parent 1cad4720
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
import android.service.wallpaper.WallpaperService;
import android.text.TextUtils;
@@ -53,6 +52,7 @@ import com.android.wallpaper.asset.ResourceAsset;
import com.android.wallpaper.model.LiveWallpaperInfo;

import com.bumptech.glide.request.RequestOptions;
import com.google.android.apps.wallpaper.asset.ThemeBundleThumbAsset;

import org.json.JSONArray;
import org.json.JSONException;
@@ -204,7 +204,7 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB
                        mStubApkResources.getIdentifier(WALLPAPER_ACTION_PREFIX + themeName,
                                "string", mStubPackageName))
                        .setWallpaperAsset(wallpaperThumbnailResId != ID_NULL ?
                                getDrawableResourceAsset(WALLPAPER_THUMB_PREFIX, themeName)
                                getThumbAsset(WALLPAPER_THUMB_PREFIX, themeName)
                                : getDrawableResourceAsset(WALLPAPER_PREFIX, themeName));
            } else {
                // Try to see if it's a live wallpaper reference
@@ -234,7 +234,7 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB
                            LiveWallpaperInfo liveInfo = new LiveWallpaperInfo(wallpaperInfo);
                            builder.setLiveWallpaperInfo(liveInfo).setWallpaperAsset(
                                    wallpaperThumbnailResId != ID_NULL ?
                                        getDrawableResourceAsset(WALLPAPER_THUMB_PREFIX, themeName)
                                            getThumbAsset(WALLPAPER_THUMB_PREFIX, themeName)
                                        : liveInfo.getThumbAsset(mContext))
                                    .setWallpaperOptions(wallpaperOptions);
                        } catch (XmlPullParserException | IOException e) {
@@ -484,4 +484,11 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB
        return drawableResId == 0 ? null : new ResourceAsset(mStubApkResources, drawableResId,
                RequestOptions.fitCenterTransform());
    }

    private ThemeBundleThumbAsset getThumbAsset(String prefix, String themeName) {
        int drawableResId = mStubApkResources.getIdentifier(prefix + themeName,
                "drawable", mStubPackageName);
        return drawableResId == 0 ? null : new ThemeBundleThumbAsset(mStubApkResources,
                drawableResId);
    }
}
+108 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2019 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.google.android.apps.wallpaper.asset;

import android.app.Activity;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.AsyncTask;

import androidx.annotation.Nullable;

import com.android.wallpaper.asset.Asset;
import com.android.wallpaper.module.DrawableLayerResolver;
import com.android.wallpaper.module.InjectorProvider;

public class ThemeBundleThumbAsset extends Asset {
    private final Resources mRes;
    private final int mResId;
    private final DrawableLayerResolver mLayerResolver;

    public ThemeBundleThumbAsset(Resources res, int resId) {
        mRes = res;
        mResId = resId;
        mLayerResolver = InjectorProvider.getInjector().getDrawableLayerResolver();
    }

    @Override
    public void decodeBitmap(int targetWidth, int targetHeight, BitmapReceiver receiver) {
        // No scaling is needed, as the thumbnail is already a thumbnail.
        LoadThumbnailTask task = new LoadThumbnailTask(mRes, mResId, mLayerResolver, receiver);
        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
    }

    @Override
    public void decodeBitmapRegion(Rect rect, int targetWidth, int targetHeight,
            BitmapReceiver receiver) {

    }

    @Override
    public void decodeRawDimensions(@Nullable Activity activity, DimensionsReceiver receiver) {

    }

    @Override
    public boolean supportsTiling() {
        return false;
    }

    /**
     * AsyncTask subclass which loads the live wallpaper's thumbnail bitmap off the main UI thread.
     * Resolves with null if live wallpaper thumbnail is not a bitmap.
     */
    private static class LoadThumbnailTask extends AsyncTask<Void, Void, Bitmap> {
        private final DrawableLayerResolver mLayerResolver;
        private final Resources mResources;
        private final int mResId;
        private BitmapReceiver mReceiver;

        public LoadThumbnailTask(Resources res, int resId, DrawableLayerResolver resolver,
                BitmapReceiver receiver) {
            mLayerResolver = resolver;
            mReceiver = receiver;
            mResources = res;
            mResId = resId;
        }

        @Override
        protected Bitmap doInBackground(Void... unused) {
            Drawable thumb = mResources.getDrawable(mResId, null);

            // Live wallpaper components may or may not specify a thumbnail drawable.
            if (thumb instanceof BitmapDrawable) {
                return ((BitmapDrawable) thumb).getBitmap();
            } else if (thumb instanceof LayerDrawable) {
                Drawable layer = mLayerResolver.resolveLayer((LayerDrawable) thumb);
                if (layer instanceof BitmapDrawable) {
                    return ((BitmapDrawable) layer).getBitmap();
                }
            }

            // If no thumbnail was specified, return a null bitmap.
            return null;
        }

        @Override
        protected void onPostExecute(Bitmap bitmap) {
            mReceiver.onBitmapDecoded(bitmap);
        }
    }
}