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

Commit 8aa7ea54 authored by Xin Li's avatar Xin Li
Browse files

Merge Android10 QPR1 into AOSP master 

Bug: 145570283
Change-Id: I5a65313b57eebc617c8c8805df8b6c9967f2fdd2
parents 65c1ecb9 1e6ce311

src/com/android/customization/module/StatsLogUserEventLogger.java

+6 −5
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ public class StatsLogUserEventLogger extends NoOpUserEventLogger implements Them 


    @Override

    public void logActionClicked(String collectionId, int actionLabelResId) {

        WallpaperStatsLog.write(CODE, StyleEnums.WALLPAPER_EXPLORE, 0, 0, 0, 0, 0, collectionId.hashCode(),

                0, 0, 0);

        WallpaperStatsLog.write(CODE, StyleEnums.WALLPAPER_EXPLORE, 0, 0, 0, 0, 0,

                collectionId.hashCode(), 0, 0, 0);

    }



    @Override
@@ -65,7 +65,7 @@ public class StatsLogUserEventLogger extends NoOpUserEventLogger implements Them 


    @Override

    public void logCategorySelected(String collectionId) {

        WallpaperStatsLog.write(CODE, StyleEnums.WALLPAPER_SELECT,

        WallpaperStatsLog.write(CODE, StyleEnums.WALLPAPER_OPEN_CATEGORY,

                0, 0, 0, 0, 0,

                collectionId.hashCode(),

                0, 0, 0);
@@ -73,10 +73,11 @@ public class StatsLogUserEventLogger extends NoOpUserEventLogger implements Them 


    @Override

    public void logWallpaperSet(String collectionId, @Nullable String wallpaperId) {

        WallpaperStatsLog.write(CODE, StyleEnums.WALLPAPER_SELECT,

        WallpaperStatsLog.write(CODE, StyleEnums.WALLPAPER_APPLIED,

                0, 0, 0, 0, 0,

                collectionId.hashCode(),

                0, 0, 0);

                wallpaperId != null ? wallpaperId.hashCode() : 0,

                0, 0);

    }



    @Nullable

src/com/android/customization/picker/theme/ThemeFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.res.ColorStateList; 
import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.Bitmap.Config;

import android.graphics.Matrix;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;
@@ -61,6 +62,7 @@ import com.android.customization.widget.OptionSelectorController; 
import com.android.customization.widget.PreviewPager;

import com.android.wallpaper.R;

import com.android.wallpaper.asset.Asset;

import com.android.wallpaper.asset.Asset.CenterCropBitmapTask;

import com.android.wallpaper.model.WallpaperInfo;

import com.android.wallpaper.module.CurrentWallpaperInfoFactory;

import com.android.wallpaper.module.InjectorProvider;
@@ -552,7 +554,9 @@ public class ThemeFragment extends ToolbarFragment { 
                    if (wallpaperPreviewAsset != null) {

                        wallpaperPreviewAsset.decodeBitmap(

                                targetWidth, targetHeight,

                                bitmap -> setWallpaperBitmap(view, bitmap));

                                bitmap -> new CenterCropBitmapTask(bitmap, view,

                                        croppedBitmap -> setWallpaperBitmap(view, croppedBitmap))

                                .execute());

                    }

                    view.removeOnLayoutChangeListener(this);

                }