Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AOD/LS - RTL adjustments"

Browse Source
This commit is contained in:
Matt Pietal
2020-11-30 15:33:56 +00:00
committed by Android (Google) Code Review
parent 217796a2b5 5bcab675a8
commit d8ed8d942e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
View File

@@ -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"

10
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
View File

@@ -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();
}