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

Commit 2ad9fe62 authored by Vania Desmonda's avatar Vania Desmonda Committed by Android (Google) Code Review
Browse files

Merge "Add wallpaper dimming SystemAPI and implementation for handling dimming... 

Merge "Add wallpaper dimming SystemAPI and implementation for handling dimming set by multiple applications."
parents 695b7865 dde36577

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ package android { 
    field public static final String SET_SYSTEM_AUDIO_CAPTION = "android.permission.SET_SYSTEM_AUDIO_CAPTION";

    field public static final String SET_VOLUME_KEY_LONG_PRESS_LISTENER = "android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER";

    field public static final String SET_WALLPAPER_COMPONENT = "android.permission.SET_WALLPAPER_COMPONENT";

    field public static final String SET_WALLPAPER_DIM_AMOUNT = "android.permission.SET_WALLPAPER_DIM_AMOUNT";

    field public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";

    field public static final String SHUTDOWN = "android.permission.SHUTDOWN";

    field public static final String SIGNAL_REBOOT_READINESS = "android.permission.SIGNAL_REBOOT_READINESS";
@@ -992,8 +993,10 @@ package android.app { 














  public class WallpaperManager {















    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void clearWallpaper(int, int);













    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public float getWallpaperDimAmount();















    method public void setDisplayOffset(android.os.IBinder, int, int);















    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(android.content.ComponentName);













    method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT) public void setWallpaperDimAmount(@FloatRange(from=0.0f, to=1.0f) float);















  }





























}

























core/api/system-lint-baseline.txt



+10
−0




























Original line number
Diff line number
Diff line








@@ -103,6 +103,16 @@ ProtectedMember: android.service.notification.NotificationAssistantService#attac



























































RethrowRemoteException: android.app.WallpaperManager#getWallpaperDimAmount():













    Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause)













RethrowRemoteException: android.app.WallpaperManager#getWallpaperDimmingAmount():













    Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause)













RethrowRemoteException: android.app.WallpaperManager#setWallpaperDimAmount(float):













    Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause)













RethrowRemoteException: android.app.WallpaperManager#setWallpaperDimmingAmount(float):













    Methods calling system APIs should rethrow `RemoteException` as `RuntimeException` (but do not list it in the throws clause)











































SamShouldBeLast: android.accounts.AccountManager#addAccount(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler):































SamShouldBeLast: android.accounts.AccountManager#addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean):

































core/java/android/app/IWallpaperManager.aidl



+23
−0




























Original line number
Diff line number
Diff line








@@ -204,4 +204,27 @@ interface IWallpaperManager {













     * @hide















     */















    void notifyGoingToSleep(int x, int y, in Bundle extras);



























    /**













     * Sets the wallpaper dim amount between [0f, 1f] which would be blended with the system default













     * dimming. 0f doesn't add any additional dimming and 1f makes the wallpaper fully black.













     *













     * @hide













     */













    oneway void setWallpaperDimAmount(float dimAmount);



























    /**













     * Gets the current additional dim amount set on the wallpaper. 0f means no application has













     * added any dimming on top of the system default dim amount.













     *













     * @hide













     */













    float getWallpaperDimAmount();



























    /**













     * Whether the lock screen wallpaper is different from the system wallpaper.













     *













     * @hide













     */













    boolean lockScreenWallpaperExists();















}
























core/java/android/app/WallpaperColors.java



+41
−7




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.app;





























import android.annotation.FloatRange;















import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;









@@ -27,6 +28,7 @@ import android.graphics.drawable.Drawable;













import android.os.Parcel;















import android.os.Parcelable;















import android.util.Log;













import android.util.MathUtils;















import android.util.Size;































import com.android.internal.graphics.ColorUtils;









@@ -44,6 +46,7 @@ import java.util.Collections;













import java.util.HashMap;















import java.util.List;















import java.util.Map;













import java.util.Objects;















import java.util.Set;































/**










@@ -173,6 +176,22 @@ public final class WallpaperColors implements Parcelable {













        if (bitmap == null) {















            throw new IllegalArgumentException("Bitmap can't be null");















        }













        return fromBitmap(bitmap, 0f /* dimAmount */);













    }



























    /**













     * Constructs {@link WallpaperColors} from a bitmap with dimming applied.













     * <p>













     * Main colors will be extracted from the bitmap with dimming taken into account when













     * calculating dark hints.













     *













     * @param bitmap Source where to extract from.













     * @param dimAmount Wallpaper dim amount













     * @hide













     */













    public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap,













            @FloatRange (from = 0f, to = 1f) float dimAmount) {













        Objects.requireNonNull(bitmap, "Bitmap can't be null");































        final int bitmapArea = bitmap.getWidth() * bitmap.getHeight();















        boolean shouldRecycle = false;










@@ -211,7 +230,7 @@ public final class WallpaperColors implements Parcelable {





























        }





























        int hints = calculateDarkHints(bitmap);













        int hints = calculateDarkHints(bitmap, dimAmount);































        if (shouldRecycle) {















            bitmap.recycle();










@@ -507,13 +526,15 @@ public final class WallpaperColors implements Parcelable {













     * Checks if image is bright and clean enough to support light text.















     *















     * @param source What to read.













     * @param dimAmount How much wallpaper dim amount was applied.















     * @return Whether image supports dark text or not.















     */













    private static int calculateDarkHints(Bitmap source) {













    private static int calculateDarkHints(Bitmap source, float dimAmount) {















        if (source == null) {















            return 0;















        }





























        dimAmount = MathUtils.saturate(dimAmount);















        int[] pixels = new int[source.getWidth() * source.getHeight()];















        double totalLuminance = 0;















        final int maxDarkPixels = (int) (pixels.length * MAX_DARK_AREA);









@@ -521,24 +542,37 @@ public final class WallpaperColors implements Parcelable {













        source.getPixels(pixels, 0 /* offset */, source.getWidth(), 0 /* x */, 0 /* y */,















                source.getWidth(), source.getHeight());





























        // Create a new black layer with dimAmount as the alpha to be accounted for when computing













        // the luminance.













        int dimmingLayerAlpha = (int) (255 * dimAmount);













        int blackTransparent = ColorUtils.setAlphaComponent(Color.BLACK, dimmingLayerAlpha);





























        // This bitmap was already resized to fit the maximum allowed area.















        // Let's just loop through the pixels, no sweat!















        float[] tmpHsl = new float[3];















        for (int i = 0; i < pixels.length; i++) {













            ColorUtils.colorToHSL(pixels[i], tmpHsl);













            final float luminance = tmpHsl[2];













            final int alpha = Color.alpha(pixels[i]);













            int pixelColor = pixels[i];













            ColorUtils.colorToHSL(pixelColor, tmpHsl);













            final int alpha = Color.alpha(pixelColor);



























            // Apply composite colors where the foreground is a black layer with an alpha value of













            // the dim amount and the background is the wallpaper pixel color.













            int compositeColors = ColorUtils.compositeColors(blackTransparent, pixelColor);



























            // Calculate the adjusted luminance of the dimmed wallpaper pixel color.













            double adjustedLuminance = ColorUtils.calculateLuminance(compositeColors);





























            // Make sure we don't have a dark pixel mass that will















            // make text illegible.















            final boolean satisfiesTextContrast = ContrastColorUtil













                    .calculateContrast(pixels[i], Color.BLACK) > DARK_PIXEL_CONTRAST;













                    .calculateContrast(pixelColor, Color.BLACK) > DARK_PIXEL_CONTRAST;















            if (!satisfiesTextContrast && alpha != 0) {















                darkPixels++;















                if (DEBUG_DARK_PIXELS) {















                    pixels[i] = Color.RED;















                }















            }













            totalLuminance += luminance;













            totalLuminance += adjustedLuminance;















        }































        int hints = 0;

































core/java/android/app/WallpaperManager.java



+59
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.app;





























import android.annotation.FloatRange;















import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;










@@ -71,6 +72,7 @@ import android.text.TextUtils;













import android.util.ArrayMap;















import android.util.ArraySet;















import android.util.Log;













import android.util.MathUtils;















import android.util.Pair;















import android.view.Display;















import android.view.WindowManagerGlobal;










@@ -1993,6 +1995,63 @@ public class WallpaperManager {













        return setWallpaperComponent(name, mContext.getUserId());















    }





























    /**













     * Sets the wallpaper dim amount between [0f, 1f] which would be blended with the system default













     * dimming. 0f doesn't add any additional dimming and 1f makes the wallpaper fully black.













     *













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT)













    public void setWallpaperDimAmount(@FloatRange (from = 0f, to = 1f) float dimAmount) {













        if (sGlobals.mService == null) {













            Log.w(TAG, "WallpaperService not running");













            throw new RuntimeException(new DeadSystemException());













        }













        try {













            sGlobals.mService.setWallpaperDimAmount(MathUtils.saturate(dimAmount));













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**













     * Gets the current additional dim amount set on the wallpaper. 0f means no application has













     * added any dimming on top of the system default dim amount.













     *













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT)













    public float getWallpaperDimAmount() {













        if (sGlobals.mService == null) {













            Log.w(TAG, "WallpaperService not running");













            throw new RuntimeException(new DeadSystemException());













        }













        try {













            return sGlobals.mService.getWallpaperDimAmount();













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**













     * Whether the lock screen wallpaper is different from the system wallpaper.













     *













     * @hide













     */













    public boolean lockScreenWallpaperExists() {













        if (sGlobals.mService == null) {













            Log.w(TAG, "WallpaperService not running");













            throw new RuntimeException(new DeadSystemException());













        }













        try {













            return sGlobals.mService.lockScreenWallpaperExists();













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }





























    /**















     * Set the live wallpaper.















     *