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

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

Snap for 6707956 from b8b8f132 to rvc-qpr1-release

Change-Id: I9454cc3f648fc16e52439c89ced165c3619c5d43
parents 955f2b4d b8b8f132
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3728,7 +3728,8 @@ public class ActivityManager {
     * manner, excessive calls to this API could result a {@link java.lang.RuntimeException}.
     * </p>
     *
     * @param state The state data
     * @param state The state data. To be advised, <b>DO NOT</b> include sensitive information/data
     * (PII, SPII, or other sensitive user data) here. Maximum length is 128 bytes.
     */
    public void setProcessStateSummary(@Nullable byte[] state) {
        try {
+1 −6
Original line number Diff line number Diff line
@@ -6059,12 +6059,7 @@ public class Editor {
            return trueLine;
        }

        final int lineHeight = layout.getLineBottom(prevLine) - layout.getLineTop(prevLine);
        int slop = (int)(LINE_SLOP_MULTIPLIER_FOR_HANDLEVIEWS
                * (layout.getLineBottom(trueLine) - layout.getLineTop(trueLine)));
        slop = Math.max(mLineChangeSlopMin,
                Math.min(mLineChangeSlopMax, lineHeight + slop)) - lineHeight;
        slop = Math.max(0, slop);
        final int slop = (int)(LINE_SLOP_MULTIPLIER_FOR_HANDLEVIEWS * mTextView.getLineHeight());

        final float verticalOffset = mTextView.viewportToContentVerticalOffset();
        if (trueLine > prevLine && y >= layout.getLineBottom(prevLine) + slop + verticalOffset) {
+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@
  ~ limitations under the License.
  -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:fitsSystemWindows="true"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:gravity="center"
+1 −3
Original line number Diff line number Diff line
@@ -22,12 +22,10 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <!-- TODO(b/151617493): replace marginBottom with insets. -->
    <ViewStub android:id="@+id/notification_panel_stub"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:layout="@layout/notification_panel_container"
              android:layout_marginBottom="@dimen/navigation_bar_height"/>
              android:layout="@layout/notification_panel_container"/>

    <ViewStub android:id="@+id/keyguard_stub"
              android:layout_width="match_parent"
+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ public class CarKeyguardViewController extends OverlayViewController implements
        registerUserSwitchedListener();
    }

    @Override
    protected boolean shouldShowNavigationBar() {
        return true;
    }

    @Override
    public void onFinishInflate() {
        mBouncer = SystemUIFactory.getInstance().createKeyguardBouncer(mContext,
Loading