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

Commit d143a7cd authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19695565



Change-Id: Ie42aec4b2ba7dce6eb4adc6ac85baa050797cd58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64176671 e9cb2348

packages/SystemUI/src/com/android/systemui/wallpapers/ImageWallpaper.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.glwallpaper;

package com.android.systemui.wallpapers.gl;



import android.util.Size;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;