Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (04e4db47) · Commits · e / os / android_frameworks_base

core/java/android/widget/TimePickerClockDelegate.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -454,6 +454,7 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate {
		(RelativeLayout.LayoutParams) mAmPmLayout.getLayoutParams();
		if (params.getRule(RelativeLayout.RIGHT_OF) != 0
		\|\| params.getRule(RelativeLayout.LEFT_OF) != 0) {
		final int margin = (int) (mContext.getResources().getDisplayMetrics().density * 8);
		// Horizontal mode, with AM/PM appearing to left/right of hours and minutes.
		final boolean isAmPmAtLeft;
		if (TextUtils.getLayoutDirectionFromLocale(mLocale) == View.LAYOUT_DIRECTION_LTR) {
		@@ -461,10 +462,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate {
		} else {
		isAmPmAtLeft = !isAmPmAtStart;
		}
		if (mIsAmPmAtLeft == isAmPmAtLeft) {
		// AM/PM is already at the correct location. No change needed.
		return;
		}

		if (isAmPmAtLeft) {
		params.removeRule(RelativeLayout.RIGHT_OF);
		@@ -473,6 +470,14 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate {
		params.removeRule(RelativeLayout.LEFT_OF);
		params.addRule(RelativeLayout.RIGHT_OF, mMinuteView.getId());
		}

		if (isAmPmAtStart) {
		params.setMarginStart(0);
		params.setMarginEnd(margin);
		} else {
		params.setMarginStart(margin);
		params.setMarginEnd(0);
		}
		mIsAmPmAtLeft = isAmPmAtLeft;
		} else if (params.getRule(RelativeLayout.BELOW) != 0
		\|\| params.getRule(RelativeLayout.ABOVE) != 0) {

+2 −6

Original line number	Diff line number	Diff line
		@@ -76,16 +76,14 @@
		android:layout_height="wrap_content"
		android:layout_toRightOf="@+id/minutes"
		android:layout_alignBaseline="@+id/minutes"
		android:paddingStart="4dp"
		android:paddingEnd="4dp"
		android:layout_marginStart="8dp"
		android:layout_marginEnd="0dp"
		android:orientation="vertical"
		android:baselineAlignedChildIndex="1">
		<RadioButton
		android:id="@+id/am_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="4dp"
		android:paddingRight="4dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:layout_marginBottom="-8dp"
		@@ -101,8 +99,6 @@
		android:id="@+id/pm_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingLeft="4dp"
		android:paddingRight="4dp"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"

+4 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ public interface QSTile {
		public boolean isTransient = false;
		public String expandedAccessibilityClassName;
		public SlashState slash;
		public boolean handlesLongClick = true;

		public boolean copyTo(State other) {
		if (other == null) throw new IllegalArgumentException();
		@@ -133,7 +134,8 @@ public interface QSTile {
		\|\| !Objects.equals(other.state, state)
		\|\| !Objects.equals(other.isTransient, isTransient)
		\|\| !Objects.equals(other.dualTarget, dualTarget)
		\|\| !Objects.equals(other.slash, slash);
		\|\| !Objects.equals(other.slash, slash)
		\|\| !Objects.equals(other.handlesLongClick, handlesLongClick);
		other.icon = icon;
		other.iconSupplier = iconSupplier;
		other.label = label;
		@@ -146,6 +148,7 @@ public interface QSTile {
		other.dualTarget = dualTarget;
		other.isTransient = isTransient;
		other.slash = slash != null ? slash.copy() : null;
		other.handlesLongClick = handlesLongClick;
		return changed;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -68,12 +68,18 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
		protected void setPasswordEntryEnabled(boolean enabled) {
		mPasswordEntry.setEnabled(enabled);
		mOkButton.setEnabled(enabled);
		if (enabled && !mPasswordEntry.hasFocus()) {
		mPasswordEntry.requestFocus();
		}
		}

		@Override
		protected void setPasswordEntryInputEnabled(boolean enabled) {
		mPasswordEntry.setEnabled(enabled);
		mOkButton.setEnabled(enabled);
		if (enabled && !mPasswordEntry.hasFocus()) {
		mPasswordEntry.requestFocus();
		}
		}

		@Override

+3 −4

Original line number	Diff line number	Diff line
		@@ -340,12 +340,11 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		case SimPuk:
		// Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
		SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
		if (securityMode != SecurityMode.None
		\|\| !mLockPatternUtils.isLockScreenDisabled(
		if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled(
		KeyguardUpdateMonitor.getCurrentUser())) {
		showSecurityScreen(securityMode);
		} else {
		finish = true;
		} else {
		showSecurityScreen(securityMode);
		}
		break;