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

Commit ad60f199 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9043175 from 23a112e9 to tm-qpr1-release

Change-Id: I6c175629557aff1742acd2d3caf558596d8fa6ab
parents 12a8f62c 23a112e9
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -95,8 +95,11 @@ public final class NotificationChannelGroup implements Parcelable {
        } else {
            mId = null;
        }
        mName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
        mName = getTrimmedString(mName.toString());
        if (in.readByte() != 0) {
            mName = getTrimmedString(in.readString());
        } else {
            mName = "";
        }
        if (in.readByte() != 0) {
            mDescription = getTrimmedString(in.readString());
        } else {
@@ -122,7 +125,12 @@ public final class NotificationChannelGroup implements Parcelable {
        } else {
            dest.writeByte((byte) 0);
        }
        TextUtils.writeToParcel(mName.toString(), dest, flags);
        if (mName != null) {
            dest.writeByte((byte) 1);
            dest.writeString(mName.toString());
        } else {
            dest.writeByte((byte) 0);
        }
        if (mDescription != null) {
            dest.writeByte((byte) 1);
            dest.writeString(mDescription);
+1 −3
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ public class DividerSnapAlgorithm {
        int dividerMax = isHorizontalDivision
                ? mDisplayHeight
                : mDisplayWidth;
        int navBarSize = isHorizontalDivision ? mInsets.bottom : mInsets.right;
        int startPos = -mDividerSize;
        if (dockedSide == DOCKED_RIGHT) {
            startPos += mInsets.left;
@@ -308,8 +307,7 @@ public class DividerSnapAlgorithm {
                addMinimizedTarget(isHorizontalDivision, dockedSide);
                break;
        }
        mTargets.add(new SnapTarget(dividerMax - navBarSize, dividerMax,
                SnapTarget.FLAG_DISMISS_END, 0.35f));
        mTargets.add(new SnapTarget(dividerMax, dividerMax, SnapTarget.FLAG_DISMISS_END, 0.35f));
    }

    private void addNonDismissingTargets(boolean isHorizontalDivision, int topPosition,
+1 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@
    <!-- Message shown during face acquisition when the image is too bright [CHAR LIMIT=50] -->
    <string name="face_acquired_too_bright">Too bright. Try gentler lighting.</string>
    <!-- Message shown during face acquisition when the image is too dark [CHAR LIMIT=50] -->
    <string name="face_acquired_too_dark">Try brighter lighting</string>
    <string name="face_acquired_too_dark">Not enough light</string>
    <!-- Message shown during face acquisition when the user is too close to sensor [CHAR LIMIT=50] -->
    <string name="face_acquired_too_close">Move phone farther away</string>
    <!-- Message shown during face acquisition when the user is too far from sensor [CHAR LIMIT=50] -->
+16 −0
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@
package android.app;

import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertTrue;

import android.os.Parcel;
import android.test.AndroidTestCase;
import android.text.TextUtils;

import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -70,4 +72,18 @@ public class NotificationChannelGroupTest {
        assertEquals(NotificationChannelGroup.MAX_TEXT_LENGTH,
                fromParcel.getDescription().length());
    }

    @Test
    public void testNullableFields() {
        NotificationChannelGroup group = new NotificationChannelGroup("my_group_01", null);

        Parcel parcel = Parcel.obtain();
        group.writeToParcel(parcel, 0);
        parcel.setDataPosition(0);

        NotificationChannelGroup fromParcel =
                NotificationChannelGroup.CREATOR.createFromParcel(parcel);
        assertEquals(group.getId(), fromParcel.getId());
        assertTrue(TextUtils.isEmpty(fromParcel.getName()));
    }
}
+5 −1
Original line number Diff line number Diff line
@@ -876,8 +876,12 @@ public class ShellTaskOrganizer extends TaskOrganizer implements
                    pkg = info.getTaskInfo().baseActivity.getPackageName();
                }
                Rect bounds = info.getTaskInfo().getConfiguration().windowConfiguration.getBounds();
                boolean running = info.getTaskInfo().isRunning;
                boolean visible = info.getTaskInfo().isVisible;
                boolean focused = info.getTaskInfo().isFocused;
                pw.println(innerPrefix + "#" + i + " task=" + key + " listener=" + listener
                        + " wmMode=" + windowingMode + " pkg=" + pkg + " bounds=" + bounds);
                        + " wmMode=" + windowingMode + " pkg=" + pkg + " bounds=" + bounds
                        + " running=" + running + " visible=" + visible + " focused=" + focused);
            }

            pw.println();
Loading