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

Commit 87854577 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5834835 from b5b3a581 to qt-qpr1-release 

Change-Id: I1f4f07431138a649f806cf5d7022285a8e0dec48
parents 4338531d b5b3a581

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -3476,6 +3476,14 @@ public final class Settings { 
            }

        };













        /**













         * The user selected min refresh rate in frames per second.













         *













         * If this isn't set, 0 will be used.













         * @hide













         */













        public static final String MIN_REFRESH_RATE = "min_refresh_rate";



























        /**















         * The user selected peak refresh rate in frames per second.















         *

































core/java/android/view/GestureExclusionTracker.java



+3
−2






























Original line number
Diff line number
Diff line








@@ -44,7 +44,7 @@ class GestureExclusionTracker {













        while (i.hasNext()) {















            final GestureExclusionViewInfo info = i.next();















            final View v = info.getView();













            if (v == null || !v.isAttachedToWindow()) {













            if (v == null || !v.isAttachedToWindow() || !v.isShown()) {















                mGestureExclusionViewsChanged = true;















                i.remove();















                continue;










@@ -122,7 +122,8 @@ class GestureExclusionTracker {





























        public int update() {















            final View excludedView = getView();













            if (excludedView == null || !excludedView.isAttachedToWindow()) return GONE;













            if (excludedView == null || !excludedView.isAttachedToWindow()













                    || !excludedView.isShown()) return GONE;















            final List<Rect> localRects = excludedView.getSystemGestureExclusionRects();















            final List<Rect> newRects = new ArrayList<>(localRects.size());















            for (Rect src : localRects) {

































core/java/android/view/View.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -14423,6 +14423,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        }





























        notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);













        updateSystemGestureExclusionRects();















    }





























    /**

























core/java/android/widget/ImageView.java



+5
−3






























Original line number
Diff line number
Diff line








@@ -62,8 +62,9 @@ import java.io.IOException;













/**















 * Displays image resources, for example {@link android.graphics.Bitmap}















 * or {@link android.graphics.drawable.Drawable} resources.













 * ImageView is also commonly used to {@link #setImageTintMode(PorterDuff.Mode)













 * apply tints to an image} and handle {@link #setScaleType(ScaleType) image scaling}.













 * ImageView is also commonly used to













 * <a href="#setImageTintMode(android.graphics.PorterDuff.Mode)">apply tints to an image</a> and













 * handle <a href="#setScaleType(android.widget.ImageView.ScaleType)">image scaling</a>.















 *















 * <p>















 * The following XML snippet is a common example of using an ImageView to display an image resource:









@@ -76,7 +77,8 @@ import java.io.IOException;













 *     &lt;ImageView















 *         android:layout_width="wrap_content"















 *         android:layout_height="wrap_content"













 *         android:src="@mipmap/ic_launcher"













 *         android:src="@drawable/my_image"













 *         android:contentDescription="@string/my_image_description"















 *         /&gt;















 * &lt;/LinearLayout&gt;















 * </pre>

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -93,6 +93,7 @@ public class SettingsBackupTest {













                    Settings.System.VOLUME_VOICE, // deprecated since API 2?















                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?















                    Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, // used for debugging only













                    Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities















                    Settings.System.PEAK_REFRESH_RATE // depends on hardware capabilities















                    );