Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "WallpaperColors hint computation"" into pi-dev

Browse Source 
am: cf2c35dca6

Change-Id: Ibc3760ce650c8d48f261e6486edb51582391b710
This commit is contained in:
Lucas Dupin
2018-05-24 14:03:24 -07:00
committed by android-build-merger
parent 984436e530 cf2c35dca6
commit 30f0867ee0
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/WallpaperColors.java
View File

@@ -144,13 +144,6 @@ public final class WallpaperColors implements Parcelable {
* @param bitmap Source where to extract from. * @param bitmap Source where to extract from.
*/ */
public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap) { public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap) {
return fromBitmap(bitmap, false /* computeHints */);
}
/**
* @hide
*/
public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap, boolean computeHints) {
if (bitmap == null) { if (bitmap == null) {
throw new IllegalArgumentException("Bitmap can't be null"); throw new IllegalArgumentException("Bitmap can't be null");
} }
@@ -200,7 +193,7 @@ public final class WallpaperColors implements Parcelable {
} }
} }
int hints = computeHints ? calculateDarkHints(bitmap) : 0; int hints = calculateDarkHints(bitmap);
if (shouldRecycle) { if (shouldRecycle) {
bitmap.recycle(); bitmap.recycle();

2
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -557,7 +557,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
if (cropFile != null) { if (cropFile != null) {
Bitmap bitmap = BitmapFactory.decodeFile(cropFile); Bitmap bitmap = BitmapFactory.decodeFile(cropFile);
if (bitmap != null) { if (bitmap != null) {
colors = WallpaperColors.fromBitmap(bitmap, true /* computeHints */); colors = WallpaperColors.fromBitmap(bitmap);
bitmap.recycle(); bitmap.recycle();
} }
} }

15
services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
View File

@@ -20,8 +20,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.app.WallpaperColors; import android.app.WallpaperColors;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
@@ -87,17 +85,4 @@ public class WallpaperServiceTests {
assertEquals("OnComputeColors should have been deferred.", assertEquals("OnComputeColors should have been deferred.",
0, eventCountdown.getCount()); 0, eventCountdown.getCount());
} }
@Test
public void testFromDrawableTest_doesntComputeHints() {
WallpaperColors wallpaperColors = WallpaperColors.fromDrawable(
new ColorDrawable(Color.BLACK));
assertEquals("WallpaperColors should not support dark theme.", 0,
wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_THEME);
wallpaperColors = WallpaperColors.fromDrawable(
new ColorDrawable(Color.WHITE));
assertEquals("WallpaperColors should not support dark text.", 0,
wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT);
}
} }