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

Commit e9cb2348 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

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

* changes:
  move glwallpaper to package wallpapers.gl
  Move ImageWallpaper.java into package 'com.android.systemui.wallpapers'
parents d8835256 af4de20f

core/java/android/service/wallpaper/WallpaperService.java

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

core/res/res/values/config.xml

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

packages/SystemUI/AndroidManifest.xml

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

packages/SystemUI/src/com/android/systemui/dagger/DefaultServiceBinder.java

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

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

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