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

Commit 8ccb9ce3 authored by wilsonshih's avatar wilsonshih
Browse files

Support wallpaper on secondary displays.(6/N) 

Provide an API that let the Engine get the corresponding display context.
As a result, wallpaper developers can easily get the right resources.

Bug: 115486823
Test: atest WallpaperManagerTest
Change-Id: I9ec85028331c2d2e4445b9a47ee05dc311a8e3e7
parent a282bf7e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41371,6 +41371,7 @@ package android.service.wallpaper { 
    method protected void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

    method public int getDesiredMinimumHeight();

    method public int getDesiredMinimumWidth();

    method public android.content.Context getDisplayContext();

    method public android.view.SurfaceHolder getSurfaceHolder();

    method public boolean isPreview();

    method public boolean isVisible();

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

+17 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.Service; 
import android.app.WallpaperColors;

import android.app.WallpaperInfo;

import android.app.WallpaperManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.TypedArray;

import android.graphics.Bitmap;
@@ -52,12 +53,12 @@ import android.view.InputChannel; 
import android.view.InputDevice;

import android.view.InputEvent;

import android.view.InputEventReceiver;

import android.view.InsetsState;

import android.view.MotionEvent;

import android.view.SurfaceHolder;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;

import android.view.InsetsState;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;
@@ -211,7 +212,8 @@ public abstract class WallpaperService extends Service { 
        private final Supplier<Long> mClockFunction;

        private final Handler mHandler;



        Display mDisplay;

        private Display mDisplay;

        private Context mDisplayContext;

        private int mDisplayState;



        final BaseSurfaceHolder mSurfaceHolder = new BaseSurfaceHolder() {
@@ -1038,6 +1040,7 @@ public abstract class WallpaperService extends Service { 
            mIWallpaperEngine.mDisplayManager.registerDisplayListener(mDisplayListener,

                    mCaller.getHandler());

            mDisplay = mIWallpaperEngine.mDisplay;

            mDisplayContext = createDisplayContext(mDisplay);

            mDisplayState = mDisplay.getState();



            if (DEBUG) Log.v(TAG, "onCreate(): " + this);
@@ -1049,6 +1052,18 @@ public abstract class WallpaperService extends Service { 
            updateSurface(false, false, false);

        }



        /**

         * The {@link Context} with resources that match the current display the wallpaper is on.

         * For multiple display environment, multiple engines can be created to render on each

         * display, but these displays may have different densities. Use this context to get the

         * corresponding resources for currently display, avoiding the context of the service.

         *

         * @return A {@link Context} for current display.

         */

        public Context getDisplayContext() {

            return mDisplayContext;

        }



        /**

         * Executes life cycle event and updates internal ambient mode state based on

         * message sent from handler.