From 369f1b973ee021cc5285308d6fb64fc4691b813d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= Date: Mon, 22 Aug 2022 12:22:40 +0000 Subject: [PATCH 1/2] Move ImageWallpaper.java into package 'com.android.systemui.wallpapers' Test: Manual on mobile (try to download & attach a wallpaper, check that nothing breaks) Test: atest ImageWallpaperTest Bug: 243402530 Change-Id: I5af1acf08bb1c43a5e119597a9cef2ea667723c3 --- core/java/android/service/wallpaper/WallpaperService.java | 2 +- core/res/res/values/config.xml | 2 +- packages/SystemUI/AndroidManifest.xml | 2 +- .../src/com/android/systemui/dagger/DefaultServiceBinder.java | 2 +- .../com/android/systemui/{ => wallpapers}/ImageWallpaper.java | 2 +- .../android/systemui/{ => wallpapers}/ImageWallpaperTest.java | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) rename packages/SystemUI/src/com/android/systemui/{ => wallpapers}/ImageWallpaper.java (99%) rename packages/SystemUI/tests/src/com/android/systemui/{ => wallpapers}/ImageWallpaperTest.java (98%) diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 14cfe6a6efab2..01749c0bebb9a 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -519,7 +519,7 @@ public abstract class WallpaperService extends Service { * {@link #addLocalColorsAreas(List)} * {@link #removeLocalColorsAreas(List)} * When local colors change, call {@link #notifyLocalColorsChanged(List, List)} - * See {@link com.android.systemui.ImageWallpaper} for an example + * See {@link com.android.systemui.wallpapers.ImageWallpaper} for an example * @hide */ public boolean supportsLocalColorExtraction() { diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d5f40e0eb259b..c3b6df1445441 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1733,7 +1733,7 @@ @null - com.android.systemui/com.android.systemui.ImageWallpaper + com.android.systemui/com.android.systemui.wallpapers.ImageWallpaper true diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 7649de649cf8c..2737ecf5ffa62 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -414,7 +414,7 @@ - diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java b/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java index e1cbdcdd86c18..92eeace648ad7 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java @@ -18,7 +18,6 @@ package com.android.systemui.dagger; import android.app.Service; -import com.android.systemui.ImageWallpaper; import com.android.systemui.SystemUIService; import com.android.systemui.doze.DozeService; import com.android.systemui.dreams.DreamOverlayService; @@ -26,6 +25,7 @@ import com.android.systemui.dump.SystemUIAuxiliaryDumpService; import com.android.systemui.keyguard.KeyguardService; import com.android.systemui.screenrecord.RecordingService; import com.android.systemui.statusbar.phone.NotificationListenerWithPlugins; +import com.android.systemui.wallpapers.ImageWallpaper; import dagger.Binds; import dagger.Module; diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/ImageWallpaper.java rename to packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java index 8ff90f780c99d..6f500711b3370 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui; +package com.android.systemui.wallpapers; import android.app.WallpaperColors; import android.graphics.Bitmap; diff --git a/packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java similarity index 98% rename from packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java rename to packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java index e1ddaada44cf8..51d1406c6a871 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui; +package com.android.systemui.wallpapers; import static com.google.common.truth.Truth.assertWithMessage; @@ -40,6 +40,7 @@ import android.view.Display; import android.view.DisplayInfo; import android.view.SurfaceHolder; +import com.android.systemui.SysuiTestCase; import com.android.systemui.glwallpaper.ImageWallpaperRenderer; import org.junit.Before; From af4de20faaa5f289e168a2a7287cd5cc9a47187f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= Date: Mon, 22 Aug 2022 12:45:37 +0000 Subject: [PATCH 2/2] move glwallpaper to package wallpapers.gl Test: Manual on mobile (try to download & attach a wallpaper, check that nothing breaks) Bug: 243402530 Change-Id: Ieeef9c7a28e63677716cd792b56cbb8d678daf10 --- .../src/com/android/systemui/wallpapers/ImageWallpaper.java | 4 ++-- .../systemui/{glwallpaper => wallpapers/gl}/EglHelper.java | 2 +- .../{glwallpaper => wallpapers/gl}/GLWallpaperRenderer.java | 2 +- .../{glwallpaper => wallpapers/gl}/ImageGLProgram.java | 2 +- .../{glwallpaper => wallpapers/gl}/ImageGLWallpaper.java | 2 +- .../gl}/ImageWallpaperRenderer.java | 2 +- .../com/android/systemui/wallpapers/ImageWallpaperTest.java | 2 +- .../{glwallpaper => wallpapers/gl}/EglHelperTest.java | 2 +- .../gl}/ImageWallpaperRendererTest.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename packages/SystemUI/src/com/android/systemui/{glwallpaper => wallpapers/gl}/EglHelper.java (99%) rename packages/SystemUI/src/com/android/systemui/{glwallpaper => wallpapers/gl}/GLWallpaperRenderer.java (97%) rename packages/SystemUI/src/com/android/systemui/{glwallpaper => wallpapers/gl}/ImageGLProgram.java (98%) rename packages/SystemUI/src/com/android/systemui/{glwallpaper => wallpapers/gl}/ImageGLWallpaper.java (99%) rename packages/SystemUI/src/com/android/systemui/{glwallpaper => wallpapers/gl}/ImageWallpaperRenderer.java (99%) rename packages/SystemUI/tests/src/com/android/systemui/{glwallpaper => wallpapers/gl}/EglHelperTest.java (99%) rename packages/SystemUI/tests/src/com/android/systemui/{glwallpaper => wallpapers/gl}/ImageWallpaperRendererTest.java (98%) diff --git a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java index 6f500711b3370..2878ad90835bc 100644 --- a/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java @@ -37,8 +37,8 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.glwallpaper.EglHelper; -import com.android.systemui.glwallpaper.ImageWallpaperRenderer; +import com.android.systemui.wallpapers.gl.EglHelper; +import com.android.systemui.wallpapers.gl.ImageWallpaperRenderer; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/EglHelper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/EglHelper.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/glwallpaper/EglHelper.java rename to packages/SystemUI/src/com/android/systemui/wallpapers/gl/EglHelper.java index 11e215d0d358d..f9ddce8e3b2ec 100644 --- a/packages/SystemUI/src/com/android/systemui/glwallpaper/EglHelper.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/EglHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import static android.opengl.EGL14.EGL_ALPHA_SIZE; import static android.opengl.EGL14.EGL_BLUE_SIZE; diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/GLWallpaperRenderer.java b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/GLWallpaperRenderer.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/glwallpaper/GLWallpaperRenderer.java rename to packages/SystemUI/src/com/android/systemui/wallpapers/gl/GLWallpaperRenderer.java index 61524900b89b7..692ced08f6137 100644 --- a/packages/SystemUI/src/com/android/systemui/glwallpaper/GLWallpaperRenderer.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/GLWallpaperRenderer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import android.util.Size; diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.java b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLProgram.java similarity index 98% rename from packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.java rename to packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLProgram.java index d03b00bcfc85a..d34eca4831dbd 100644 --- a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLProgram.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import static android.opengl.GLES20.GL_FRAGMENT_SHADER; import static android.opengl.GLES20.GL_VERTEX_SHADER; diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLWallpaper.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java rename to packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLWallpaper.java index 1a53c28c0fc56..f1659b9a8723b 100644 --- a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLWallpaper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import static android.opengl.GLES20.GL_FLOAT; import static android.opengl.GLES20.GL_LINEAR; diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageWallpaperRenderer.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java rename to packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageWallpaperRenderer.java index 7c0b93b7eebc3..e393786e29d97 100644 --- a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java +++ b/packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageWallpaperRenderer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import static android.opengl.GLES20.GL_COLOR_BUFFER_BIT; import static android.opengl.GLES20.glClear; diff --git a/packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java index 51d1406c6a871..e47acd8d38341 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java @@ -41,7 +41,7 @@ import android.view.DisplayInfo; import android.view.SurfaceHolder; import com.android.systemui.SysuiTestCase; -import com.android.systemui.glwallpaper.ImageWallpaperRenderer; +import com.android.systemui.wallpapers.gl.ImageWallpaperRenderer; import org.junit.Before; import org.junit.Ignore; diff --git a/packages/SystemUI/tests/src/com/android/systemui/glwallpaper/EglHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/EglHelperTest.java similarity index 99% rename from packages/SystemUI/tests/src/com/android/systemui/glwallpaper/EglHelperTest.java rename to packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/EglHelperTest.java index a3221b58e937c..a42badeb228f6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/glwallpaper/EglHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/EglHelperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SystemUI/tests/src/com/android/systemui/glwallpaper/ImageWallpaperRendererTest.java b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/ImageWallpaperRendererTest.java similarity index 98% rename from packages/SystemUI/tests/src/com/android/systemui/glwallpaper/ImageWallpaperRendererTest.java rename to packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/ImageWallpaperRendererTest.java index 510b907226507..89b2222df69e1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/glwallpaper/ImageWallpaperRendererTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/ImageWallpaperRendererTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.glwallpaper; +package com.android.systemui.wallpapers.gl; import static com.google.common.truth.Truth.assertThat;