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

Merge changes from topic "wallpaper-refactor" into tm-qpr-dev

Browse Source 
* changes:
  move glwallpaper to package wallpapers.gl
  Move ImageWallpaper.java into package 'com.android.systemui.wallpapers'
This commit is contained in:
Aurélien Pomini
2022-09-13 13:17:47 +00:00
committed by Android (Google) Code Review
parent d883525692 af4de20faa
commit e9cb2348db
13 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -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() {

2
core/res/res/values/config.xml
View File

@@ -1733,7 +1733,7 @@
<item name="default_lock_wallpaper" type="drawable">@null</item>
<!-- Component name of the built in wallpaper used to display bitmap wallpapers. This must not be null. -->
<string name="image_wallpaper_component" translatable="false">com.android.systemui/com.android.systemui.ImageWallpaper</string>
<string name="image_wallpaper_component" translatable="false">com.android.systemui/com.android.systemui.wallpapers.ImageWallpaper</string>
<!-- True if WallpaperService is enabled -->
<bool name="config_enableWallpaperService">true</bool>

2
packages/SystemUI/AndroidManifest.xml
View File

@@ -414,7 +414,7 @@
</intent-filter>
</receiver>
<service android:name=".ImageWallpaper"
<service android:name=".wallpapers.ImageWallpaper"
android:singleUser="true"
android:permission="android.permission.BIND_WALLPAPER"
android:exported="true" />

2
packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java
View File

@@ -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;

6
packages/SystemUI/src/com/android/systemui/ImageWallpaper.java → packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java
View File

@@ -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;
@@ -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;

2
packages/SystemUI/src/com/android/systemui/glwallpaper/EglHelper.java → packages/SystemUI/src/com/android/systemui/wallpapers/gl/EglHelper.java
View File

@@ -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;

2
packages/SystemUI/src/com/android/systemui/glwallpaper/GLWallpaperRenderer.java → packages/SystemUI/src/com/android/systemui/wallpapers/gl/GLWallpaperRenderer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.systemui.glwallpaper;
package com.android.systemui.wallpapers.gl;
import android.util.Size;

2
packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLProgram.java → packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLProgram.java
View File

@@ -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;

2
packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java → packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageGLWallpaper.java
View File

@@ -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;

2
packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java → packages/SystemUI/src/com/android/systemui/wallpapers/gl/ImageWallpaperRenderer.java
View File

@@ -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;

5
packages/SystemUI/tests/src/com/android/systemui/ImageWallpaperTest.java → packages/SystemUI/tests/src/com/android/systemui/wallpapers/ImageWallpaperTest.java
View File

@@ -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,7 +40,8 @@ import android.view.Display;
import android.view.DisplayInfo;
import android.view.SurfaceHolder;
import com.android.systemui.glwallpaper.ImageWallpaperRenderer;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.wallpapers.gl.ImageWallpaperRenderer;
import org.junit.Before;
import org.junit.Ignore;

2
packages/SystemUI/tests/src/com/android/systemui/glwallpaper/EglHelperTest.java → packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/EglHelperTest.java
View File

@@ -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;

2
packages/SystemUI/tests/src/com/android/systemui/glwallpaper/ImageWallpaperRendererTest.java → packages/SystemUI/tests/src/com/android/systemui/wallpapers/gl/ImageWallpaperRendererTest.java
View File

@@ -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;