Merge "Ensure AM/PM buttons are at least 48x48dp" (8de78eba) · Commits · e / os / android_frameworks_base

core/java/android/widget/TimePickerClockDelegate.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.content.res.ColorStateList;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.drawable.Drawable;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.SpannableStringBuilder;
		@@ -32,7 +31,6 @@ import android.text.style.TtsSpan;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.StateSet;
		import android.util.TypedValue;
		import android.view.HapticFeedbackConstants;
		import android.view.KeyCharacterMap;
		import android.view.KeyEvent;
		@@ -66,10 +64,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl
		// Also NOT a real index, just used for keyboard mode.
		private static final int ENABLE_PICKER_INDEX = 3;

		private static final int[] ATTRS_TEXT_COLOR = new int[] {
		com.android.internal.R.attr.textColor};
		private static final int[] ATTRS_DISABLED_ALPHA = new int[] {
		com.android.internal.R.attr.disabledAlpha};
		private static final int[] ATTRS_TEXT_COLOR = new int[] {R.attr.textColor};
		private static final int[] ATTRS_DISABLED_ALPHA = new int[] {R.attr.disabledAlpha};

		// LayoutLib relies on these constants. Change TimePickerClockDelegate_Delegate if
		// modifying these.

core/res/res/layout-land/time_picker_material.xml

+17 −8

Original line number	Diff line number	Diff line
		@@ -46,7 +46,8 @@
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:layout_centerInParent="true"
		android:paddingTop="@dimen/timepicker_radial_picker_top_margin">
		android:paddingTop="@dimen/timepicker_radial_picker_top_margin"
		android:layout_marginBottom="-12dp">

		<!-- The hour should always be to the left of the separator,
		regardless of the current locale's layout direction. -->
		@@ -57,14 +58,16 @@
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="right" />
		android:gravity="right"
		android:includeFontPadding="false" />

		<TextView
		android:id="@+id/separator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:importantForAccessibility="no" />
		android:importantForAccessibility="no"
		android:includeFontPadding="false" />

		<!-- The minutes should always be to the right of the separator,
		regardless of the current locale's layout direction. -->
		@@ -75,7 +78,8 @@
		android:textAppearance="@style/TextAppearance.Material.TimePicker.TimeLabel"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="left" />
		android:gravity="left"
		android:includeFontPadding="false" />
		</LinearLayout>

		<!-- The layout alignment of this view will switch between toRightOf
		@@ -93,22 +97,27 @@
		android:id="@+id/am_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minHeight="48dp"
		android:minWidth="48dp"
		android:gravity="bottom"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
		android:paddingStart="@dimen/timepicker_ampm_horizontal_padding"
		android:paddingEnd="@dimen/timepicker_ampm_horizontal_padding"
		android:paddingTop="@dimen/timepicker_am_top_padding"
		android:paddingTop="4dp"
		android:paddingBottom="6dp"
		android:lines="1"
		android:ellipsize="none"
		android:includeFontPadding="false" />
		android:ellipsize="none" />

		<CheckedTextView
		android:id="@+id/pm_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minHeight="48dp"
		android:minWidth="48dp"
		android:gravity="top"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
		android:paddingStart="@dimen/timepicker_ampm_horizontal_padding"
		android:paddingEnd="@dimen/timepicker_ampm_horizontal_padding"
		android:paddingTop="@dimen/timepicker_pm_top_padding"
		android:lines="1"
		android:ellipsize="none"
		android:includeFontPadding="false" />

core/res/res/layout/time_picker_header_material.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,9 @@
		android:id="@+id/am_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="48dp"
		android:minHeight="48dp"
		android:gravity="bottom"
		android:paddingTop="@dimen/timepicker_am_top_padding"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
		android:lines="1"
		@@ -86,6 +89,9 @@
		android:id="@+id/pm_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="48dp"
		android:minHeight="48dp"
		android:gravity="top"
		android:paddingTop="@dimen/timepicker_pm_top_padding"
		android:textAppearance="@style/TextAppearance.Material.TimePicker.AmPmLabel"
		android:lines="1"