Snap for 6949869 from 24038f61c59e012a35655a6a4b9f28535a5dc91d to rvc-qpr2-release (f1a1ba1c) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ import android.view.ViewTreeObserver;
		import android.view.Window;
		import android.view.WindowInsets;
		import android.view.WindowInsets.Side;
		import android.view.WindowInsets.Type;
		import android.view.WindowManager;
		import android.view.animation.AnimationUtils;
		import android.view.inputmethod.CompletionInfo;
		@@ -104,7 +105,7 @@ import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Collections;
		import java.util.ArrayList;

		/**
		* InputMethodService provides a standard implementation of an InputMethod,
		@@ -850,10 +851,19 @@ public class InputMethodService extends AbstractInputMethodService {

		/** Set region of the keyboard to be avoided from back gesture */
		private void setImeExclusionRect(int visibleTopInsets) {
		View inputFrameRootView = mInputFrame.getRootView();
		Rect r = new Rect(0, visibleTopInsets, inputFrameRootView.getWidth(),
		inputFrameRootView.getHeight());
		inputFrameRootView.setSystemGestureExclusionRects(Collections.singletonList(r));
		View rootView = mInputFrame.getRootView();
		android.graphics.Insets systemGesture =
		rootView.getRootWindowInsets().getInsetsIgnoringVisibility(Type.systemGestures());
		ArrayList<Rect> exclusionRects = new ArrayList<>();
		exclusionRects.add(new Rect(0,
		visibleTopInsets,
		systemGesture.left,
		rootView.getHeight()));
		exclusionRects.add(new Rect(rootView.getWidth() - systemGesture.right,
		visibleTopInsets,
		rootView.getWidth(),
		rootView.getHeight()));
		rootView.setSystemGestureExclusionRects(exclusionRects);
		}

		/**

core/java/android/os/IPowerManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ interface IPowerManager
		boolean isAmbientDisplaySuppressedForToken(String token);
		// returns whether ambient display is suppressed by any app with any token.
		boolean isAmbientDisplaySuppressed();
		// returns whether ambient display is suppressed by the given app with the given token.
		boolean isAmbientDisplaySuppressedForTokenByApp(String token, int appUid);

		// Forces the system to suspend even if there are held wakelocks.
		boolean forceSuspend();

core/java/android/os/PowerManager.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -2126,6 +2126,27 @@ public final class PowerManager {
		}
		}

		/**
		* Returns true if ambient display is suppressed by the given {@code appUid} with the given
		* {@code token}.
		*
		* <p>This method will return false if {@link #isAmbientDisplayAvailable()} is false.
		*
		* @param token The identifier of the ambient display suppression.
		* @param appUid The uid of the app that suppressed ambient display.
		* @hide
		*/
		@RequiresPermission(allOf = {
		android.Manifest.permission.READ_DREAM_STATE,
		android.Manifest.permission.READ_DREAM_SUPPRESSION })
		public boolean isAmbientDisplaySuppressedForTokenByApp(@NonNull String token, int appUid) {
		try {
		return mService.isAmbientDisplaySuppressedForTokenByApp(token, appUid);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Returns the reason the phone was last shutdown. Calling app must have the
		* {@link android.Manifest.permission#DEVICE_POWER} permission to request this information.

core/res/AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -4295,6 +4295,10 @@
		<permission android:name="android.permission.WRITE_DREAM_STATE"
		android:protectionLevel="signature\|privileged" />

		<!-- @hide Allows applications to read whether ambient display is suppressed. -->
		<permission android:name="android.permission.READ_DREAM_SUPPRESSION"
		android:protectionLevel="signature" />

		<!-- @SystemApi Allow an application to read and write the cache partition.
		@hide -->
		<permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"

packages/SettingsLib/src/com/android/settingslib/Utils.java

+33 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@ import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.Bitmap;
		import android.graphics.Color;
		import android.graphics.ColorFilter;
		import android.graphics.ColorMatrix;
		import android.graphics.ColorMatrixColorFilter;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.location.LocationManager;
		@@ -302,6 +305,36 @@ public class Utils {
		return drawable;
		}

		/**
		* Create a color matrix suitable for a ColorMatrixColorFilter that modifies only the color but
		* preserves the alpha for a given drawable
		* @param color
		* @return a color matrix that uses the source alpha and given color
		*/
		public static ColorMatrix getAlphaInvariantColorMatrixForColor(@ColorInt int color) {
		int r = Color.red(color);
		int g = Color.green(color);
		int b = Color.blue(color);

		ColorMatrix cm = new ColorMatrix(new float[] {
		0, 0, 0, 0, r,
		0, 0, 0, 0, g,
		0, 0, 0, 0, b,
		0, 0, 0, 1, 0 });

		return cm;
		}

		/**
		* Create a ColorMatrixColorFilter to tint a drawable but retain its alpha characteristics
		*
		* @return a ColorMatrixColorFilter which changes the color of the output but is invariant on
		* the source alpha
		*/
		public static ColorFilter getAlphaInvariantColorFilterForColor(@ColorInt int color) {
		return new ColorMatrixColorFilter(getAlphaInvariantColorMatrixForColor(color));
		}

		/**
		* Determine whether a package is a "system package", in which case certain things (like
		* disabling notifications or disabling the package altogether) should be disallowed.