Snap for 9779625 from 517df64d212c846d808369e473cad3fa91f19c79 to tm-qpr3-release (76719db1) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -1430,7 +1430,7 @@ public abstract class WallpaperService extends Service {
		com.android.internal.R.dimen.config_wallpaperDimAmount);
		mWallpaperDimAmount = mDefaultDimAmount;
		mPreviousWallpaperDimAmount = mWallpaperDimAmount;
		mDisplayState = mDisplay.getState();
		mDisplayState = mDisplay.getCommittedState();
		mDisplayInstallOrientation = mDisplay.getInstallOrientation();

		if (DEBUG) Log.v(TAG, "onCreate(): " + this);
		@@ -1521,7 +1521,8 @@ public abstract class WallpaperService extends Service {
		return;
		}
		if (!mDestroyed) {
		mDisplayState = mDisplay == null ? Display.STATE_UNKNOWN : mDisplay.getState();
		mDisplayState = mDisplay == null ? Display.STATE_UNKNOWN :
		mDisplay.getCommittedState();
		boolean visible = mVisible && mDisplayState != Display.STATE_OFF;
		if (mReportedVisible != visible) {
		mReportedVisible = visible;

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@android:color/system_neutral1_500" android:lStar="5" />
		</selector>
		No newline at end of file

+5 −5

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2022 The Android Open Source Project
		~ Copyright (C) 2023 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		@@ -13,7 +13,7 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogLayout
		<com.android.wm.shell.compatui.LetterboxEduDialogLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		style="@style/LetterboxDialog">
		@@ -78,13 +78,13 @@
		android:orientation="horizontal"
		android:paddingTop="48dp">

		<com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogActionLayout
		<com.android.wm.shell.compatui.LetterboxEduDialogActionLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:icon="@drawable/letterbox_education_ic_reposition"
		app:text="@string/letterbox_education_reposition_text"/>

		<com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogActionLayout
		<com.android.wm.shell.compatui.LetterboxEduDialogActionLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart=
		@@ -118,4 +118,4 @@

		</FrameLayout>

		</com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogLayout>
		</com.android.wm.shell.compatui.LetterboxEduDialogLayout>

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import com.android.wm.shell.common.DockStateReader;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.compatui.CompatUIWindowManager.CompatUIHintsState;
		import com.android.wm.shell.compatui.letterboxedu.LetterboxEduWindowManager;
		import com.android.wm.shell.sysui.KeyguardChangeListener;
		import com.android.wm.shell.sysui.ShellController;
		import com.android.wm.shell.sysui.ShellInit;

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.common.DisplayLayout;
		import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.compatui.CompatUIController.CompatUICallback;
		import com.android.wm.shell.compatui.letterboxedu.LetterboxEduWindowManager;

		import java.util.function.Consumer;