Snap for 4373604 from 9cb14a0c95a17f683085a07c949530e03cbb1887 to oc-mr1-release (def46ed7) · Commits · e / os / android_frameworks_base

core/java/android/app/SharedElementCallback.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.os.Bundle;
		import android.os.Parcelable;
		import android.transition.TransitionUtils;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.ImageView;
		import android.widget.ImageView.ScaleType;

		@@ -202,7 +203,8 @@ public abstract class SharedElementCallback {
		} else {
		mTempMatrix.set(viewToGlobalMatrix);
		}
		return TransitionUtils.createViewBitmap(sharedElement, mTempMatrix, screenBounds);
		ViewGroup parent = (ViewGroup) sharedElement.getParent();
		return TransitionUtils.createViewBitmap(sharedElement, mTempMatrix, screenBounds, parent);
		}

		/**

core/java/android/net/NetworkCapabilities.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -772,7 +772,9 @@ public final class NetworkCapabilities implements Parcelable {

		// Ignore NOT_METERED being added or removed as it is effectively dynamic. http://b/63326103
		// TODO: properly support NOT_METERED as a mutable and requestable capability.
		final long mask = ~MUTABLE_CAPABILITIES & ~(1 << NET_CAPABILITY_NOT_METERED);
		// Ignore DUN being added or removed. http://b/65257223.
		final long mask = ~MUTABLE_CAPABILITIES
		& ~(1 << NET_CAPABILITY_NOT_METERED) & ~(1 << NET_CAPABILITY_DUN);
		long oldImmutableCapabilities = this.mNetworkCapabilities & mask;
		long newImmutableCapabilities = that.mNetworkCapabilities & mask;
		if (oldImmutableCapabilities != newImmutableCapabilities) {

core/java/android/provider/Settings.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -10839,6 +10839,26 @@ public final class Settings {
		*/
		public static final String ENABLE_DELETION_HELPER_NO_THRESHOLD_TOGGLE =
		"enable_deletion_helper_no_threshold_toggle";

		/**
		* The list of snooze options for notifications
		* This is encoded as a key=value list, separated by commas. Ex:
		*
		* "default=60,options_array=15:30:60:120"
		*
		* The following keys are supported:
		*
		* <pre>
		* default (int)
		* options_array (string)
		* </pre>
		*
		* All delays in integer minutes. Array order is respected.
		* Options will be used in order up to the maximum allowed by the UI.
		* @hide
		*/
		public static final String NOTIFICATION_SNOOZE_OPTIONS =
		"notification_snooze_options";
		}

		/**

core/java/android/transition/TransitionUtils.java

+14 −4

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ public class TransitionUtils {

		ImageView copy = new ImageView(view.getContext());
		copy.setScaleType(ImageView.ScaleType.CENTER_CROP);
		Bitmap bitmap = createViewBitmap(view, matrix, bounds);
		Bitmap bitmap = createViewBitmap(view, matrix, bounds, sceneRoot);
		if (bitmap != null) {
		copy.setImageBitmap(bitmap);
		}
		@@ -156,12 +156,19 @@ public class TransitionUtils {
		* returning.
		* @param bounds The bounds of the bitmap in the destination coordinate system (where the
		* view should be presented. Typically, this is matrix.mapRect(viewBounds);
		* @param sceneRoot A ViewGroup that is attached to the window to temporarily contain the view
		* if it isn't attached to the window.
		* @return A bitmap of the given view or null if bounds has no width or height.
		*/
		public static Bitmap createViewBitmap(View view, Matrix matrix, RectF bounds) {
		if (!view.isAttachedToWindow()) {
		public static Bitmap createViewBitmap(View view, Matrix matrix, RectF bounds,
		ViewGroup sceneRoot) {
		final boolean addToOverlay = !view.isAttachedToWindow();
		if (addToOverlay) {
		if (sceneRoot == null \|\| !sceneRoot.isAttachedToWindow()) {
		return null;
		}
		sceneRoot.getOverlay().add(view);
		}
		Bitmap bitmap = null;
		int bitmapWidth = Math.round(bounds.width());
		int bitmapHeight = Math.round(bounds.height());
		@@ -181,6 +188,9 @@ public class TransitionUtils {
		node.end(canvas);
		bitmap = ThreadedRenderer.createHardwareBitmap(node, bitmapWidth, bitmapHeight);
		}
		if (addToOverlay) {
		sceneRoot.getOverlay().remove(view);
		}
		return bitmap;
		}

core/java/com/android/internal/app/ChooserActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public class ChooserActivity extends ResolverActivity {
		private static final boolean DEBUG = false;

		private static final int QUERY_TARGET_SERVICE_LIMIT = 5;
		private static final int WATCHDOG_TIMEOUT_MILLIS = 5000;
		private static final int WATCHDOG_TIMEOUT_MILLIS = 2000;

		private Bundle mReplacementExtras;
		private IntentSender mChosenComponentSender;
		@@ -1585,8 +1585,8 @@ public class ChooserActivity extends ResolverActivity {
		} catch (RemoteException e) {
		Log.e(TAG, "Querying ChooserTargetService " + name + " failed.", e);
		mChooserActivity.unbindService(this);
		destroy();
		mChooserActivity.mServiceConnections.remove(this);
		destroy();
		}
		}
		}
		@@ -1602,7 +1602,6 @@ public class ChooserActivity extends ResolverActivity {
		}

		mChooserActivity.unbindService(this);
		destroy();
		mChooserActivity.mServiceConnections.remove(this);
		if (mChooserActivity.mServiceConnections.isEmpty()) {
		mChooserActivity.mChooserHandler.removeMessages(
		@@ -1610,6 +1609,7 @@ public class ChooserActivity extends ResolverActivity {
		mChooserActivity.sendVoiceChoicesIfNeeded();
		}
		mConnectedComponent = null;
		destroy();
		}
		}