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

Commit 7a1bde29 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Lock icon is a set distance from the bottom of display" into sc-dev am: 9470519d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350079

Change-Id: I2b51bba71803fec1cf8134b368d65b459a2e81ab
parents 36fe682d 9470519d

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -921,6 +921,7 @@ 
    <dimen name="keyguard_lock_padding">20dp</dimen>



    <dimen name="keyguard_indication_margin_bottom">32dp</dimen>

    <dimen name="lock_icon_margin_bottom">98dp</dimen>



    <!-- The text size for battery level -->

    <dimen name="battery_level_text_size">12sp</dimen>

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+9 −22
Original line number Diff line number Diff line
@@ -72,7 +72,10 @@ import javax.inject.Inject; 
 */

@StatusBarComponent.StatusBarScope

public class LockIconViewController extends ViewController<LockIconView> implements Dumpable {



    private static final float sDefaultDensity =

            (float) DisplayMetrics.DENSITY_DEVICE_STABLE / (float) DisplayMetrics.DENSITY_DEFAULT;

    private static final int sLockIconRadiusPx = (int) (sDefaultDensity * 36);

    private static final float sDistAboveKgBottomAreaPx = sDefaultDensity * 12;

    private static final AudioAttributes VIBRATION_SONIFICATION_ATTRIBUTES =

            new AudioAttributes.Builder()

                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -111,9 +114,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
    private boolean mHasUdfps;

    private float mHeightPixels;

    private float mWidthPixels;

    private float mDensity;

    private int mAmbientIndicationHeight; // in pixels

    private int mKgIndicationHeight; // in pixels

    private int mBottomPadding; // in pixels



    private boolean mShowUnlockIcon;

    private boolean mShowLockIcon;
@@ -318,11 +319,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        final DisplayMetrics metrics = mView.getContext().getResources().getDisplayMetrics();

        mWidthPixels = metrics.widthPixels;

        mHeightPixels = metrics.heightPixels;

        mDensity = metrics.density;

        mKgIndicationHeight = mView.getContext().getResources().getDimensionPixelSize(

                R.dimen.keyguard_indication_margin_bottom)

            + mView.getContext().getResources().getDimensionPixelSize(

                R.dimen.keyguard_indication_bottom_padding);

        mBottomPadding = mView.getContext().getResources().getDimensionPixelSize(

                R.dimen.lock_icon_margin_bottom);

        updateLockIconLocation();

    }
@@ -332,26 +330,15 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
            mView.setCenterLocation(new PointF(props.sensorLocationX, props.sensorLocationY),

                    props.sensorRadius);

        } else {

            final float distAboveKgBottomArea = 12 * mDensity;

            final float radius = 36 * mDensity;

            final int kgBottomAreaHeight = Math.max(mKgIndicationHeight, mAmbientIndicationHeight);

            mView.setCenterLocation(

                    new PointF(mWidthPixels / 2,

                        mHeightPixels - kgBottomAreaHeight - distAboveKgBottomArea

                            - radius / 2), (int) radius);

                        mHeightPixels - mBottomPadding - sDistAboveKgBottomAreaPx

                            - sLockIconRadiusPx), sLockIconRadiusPx);

        }



        mView.getHitRect(mSensorTouchLocation);

    }



    /**

     * Set the location of ambient indication if showing (ie: now playing)

     */

    public void setAmbientIndicationBottomPadding(int ambientIndicationBottomPadding) {

        mAmbientIndicationHeight = ambientIndicationBottomPadding;

        updateLockIconLocation();

    }



    @Override

    public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

        pw.println("mUdfpsEnrolled: " + mUdfpsEnrolled);

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −2
Original line number Diff line number Diff line
@@ -3635,8 +3635,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    public void setAmbientIndicationBottomPadding(int ambientIndicationBottomPadding) {

        if (mAmbientIndicationBottomPadding != ambientIndicationBottomPadding) {

            mAmbientIndicationBottomPadding = ambientIndicationBottomPadding;

            mLockIconViewController.setAmbientIndicationBottomPadding(

                    mAmbientIndicationBottomPadding);

            updateMaxDisplayedNotifications(true);

        }

    }