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

Commit d8ed8d94 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "AOD/LS - RTL adjustments"

parents 217796a2 5bcab675

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:gravity="center_horizontal"

            android:textSize="170dp"

            android:textSize="180dp"

            android:letterSpacing="0.02"

            android:lineSpacingMultiplier=".8"

            android:includeFontPadding="false"

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

+5 −5
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public class KeyguardSliceView extends LinearLayout { 
                    iconDrawable.setBounds(0, 0, Math.max(width, 1), iconSize);

                }

            }

            button.setCompoundDrawables(iconDrawable, null, null, null);

            button.setCompoundDrawablesRelative(iconDrawable, null, null, null);

            button.setOnClickListener(mOnClickListener);

            button.setClickable(pendingIntent != null);

        }
@@ -536,9 +536,9 @@ public class KeyguardSliceView extends LinearLayout { 
        }



        @Override

        public void setCompoundDrawables(Drawable left, Drawable top, Drawable right,

        public void setCompoundDrawablesRelative(Drawable start, Drawable top, Drawable end,

                Drawable bottom) {

            super.setCompoundDrawables(left, top, right, bottom);

            super.setCompoundDrawablesRelative(start, top, end, bottom);

            updateDrawableColors();

            updatePadding();

        }
@@ -558,9 +558,9 @@ public class KeyguardSliceView extends LinearLayout { 
        public void setLockScreenMode(int mode) {

            mLockScreenMode = mode;

            if (mLockScreenMode == KeyguardUpdateMonitor.LOCK_SCREEN_MODE_LAYOUT_1) {

                setGravity(Gravity.START);

                setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);

            } else {

                setGravity(Gravity.CENTER);

                setTextAlignment(View.TEXT_ALIGNMENT_CENTER);

            }

            updatePadding();

        }