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

Commit 8f028d60 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 773b4d5c 7f99bee1

core/java/com/android/internal/widget/LockPatternView.java

+9 −3
Original line number Diff line number Diff line
@@ -1319,6 +1319,11 @@ public class LockPatternView extends View { 


                    if (mUseLockPatternDrawable) {

                        drawCellDrawable(canvas, i, j, cellState.radius, drawLookup[i][j]);

                    } else {

                        if (isHardwareAccelerated() && cellState.hwAnimating) {

                            RecordingCanvas recordingCanvas = (RecordingCanvas) canvas;

                            recordingCanvas.drawCircle(cellState.hwCenterX, cellState.hwCenterY,

                                    cellState.hwRadius, cellState.hwPaint);

                        } else {

                            drawCircle(canvas, (int) centerX, (int) centerY + translationY,

                                    cellState.radius, drawLookup[i][j], cellState.alpha,
@@ -1328,6 +1333,7 @@ public class LockPatternView extends View { 
                }

            }

        }

    }



    private void drawLineSegment(Canvas canvas, float startX, float startY, float endX, float endY,

            long lineFadeStart, long elapsedRealtime) {

core/res/res/drawable/toast_frame_legacy.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2017, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       android:shape="rectangle">

    <solid android:color="?android:attr/colorBackground" />

    <corners android:radius="28dp" />

</shape>

core/res/res/layout/transient_notification.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:maxWidth="@dimen/toast_width"

    android:background="?android:attr/colorBackground"

    android:background="@drawable/toast_frame_legacy"

    android:elevation="@dimen/toast_elevation"

    android:layout_marginEnd="16dp"

    android:layout_marginStart="16dp"

core/res/res/layout/transient_notification_with_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:maxWidth="@dimen/toast_width"

    android:background="?android:attr/colorBackground"

    android:background="@drawable/toast_frame_legacy"

    android:elevation="@dimen/toast_elevation"

    android:layout_marginEnd="16dp"

    android:layout_marginStart="16dp"

packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java

+4 −1
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ public class RotationLockTile extends QSTileImpl<BooleanState> implements 


    private static final String EMPTY_SECONDARY_STRING = "";



    private static final String ROTATION_SETTINGS =

            "org.lineageos.lineageparts.DISPLAY_ROTATION";



    private final Icon mIcon = ResourceIcon.get(com.android.internal.R.drawable.ic_qs_auto_rotate);

    private final RotationLockController mController;

    private final SensorPrivacyManager mPrivacyManager;
@@ -122,7 +125,7 @@ public class RotationLockTile extends QSTileImpl<BooleanState> implements 


    @Override

    public Intent getLongClickIntent() {

        return new Intent(Settings.ACTION_AUTO_ROTATE_SETTINGS);

        return new Intent(ROTATION_SETTINGS);

    }



    @Override