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

Commit 66e8f4af authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Cleanup "accurate_wallpaper_downsampling" flag" into main

parents e05a59ff 4df8b83a

core/java/android/app/wallpaper.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -43,16 +43,6 @@ flag { 
  }

}



flag {

  name: "accurate_wallpaper_downsampling"

  namespace: "systemui"

  description: "Accurate downsampling of wallpaper bitmap for high resolution images"

  bug: "355665230"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "enable_connected_displays_wallpaper"

  namespace: "lse_desktop_experience"

services/core/java/com/android/server/wallpaper/WallpaperCropper.java

+7 −16
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.WallpaperManager.ORIENTATION_LANDSCAPE; 
import static android.app.WallpaperManager.ORIENTATION_UNKNOWN;

import static android.app.WallpaperManager.getOrientation;

import static android.app.WallpaperManager.getRotatedOrientation;

import static android.app.Flags.accurateWallpaperDownsampling;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.server.wallpaper.WallpaperUtils.RECORD_FILE;
@@ -378,14 +377,11 @@ public class WallpaperCropper { 
        for (int i = 0; i < wallpaper.mCropHints.size(); i++) {

            Rect adjustedRect = new Rect(wallpaper.mCropHints.valueAt(i));

            adjustedRect.offset(-wallpaper.cropHint.left, -wallpaper.cropHint.top);

            if (accurateWallpaperDownsampling()) {

            adjustedRect.left = (int) (0.5f + adjustedRect.left / wallpaper.mSampleSize);

            adjustedRect.top = (int) (0.5f + adjustedRect.top / wallpaper.mSampleSize);

            adjustedRect.right = (int) Math.floor(adjustedRect.right / wallpaper.mSampleSize);

            adjustedRect.bottom = (int) Math.floor(adjustedRect.bottom / wallpaper.mSampleSize);

            } else {

                adjustedRect.scale(1f / wallpaper.mSampleSize);

            }



            result.put(wallpaper.mCropHints.keyAt(i), adjustedRect);

        }

        return result;
@@ -612,13 +608,8 @@ public class WallpaperCropper { 
                            .getDefaultDisplaySizes().get(orientation);

                    if (displayForThisOrientation == null) continue;

                    float sampleSizeForThisOrientation = Math.max(1f, Math.min(

                            crop.width() / displayForThisOrientation.x,

                            crop.height() / displayForThisOrientation.y));

                    if (accurateWallpaperDownsampling()) {

                        sampleSizeForThisOrientation = Math.max(1f, Math.min(

                            (float) crop.width() / displayForThisOrientation.x,

                            (float) crop.height() / displayForThisOrientation.y));

                    }

                    sampleSize = Math.min(sampleSize, sampleSizeForThisOrientation);

                }

                // If the total crop has more width or height than either the max texture size