Merge "Fix accessibility for all-caps items in keyguard" into klp-dev (d7fdcad2) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/LockPatternUtils.java

+2 −18

Original line number	Diff line number	Diff line
		@@ -1260,7 +1260,7 @@ public class LockPatternUtils {
		* @param upperCase if true, converts button label string to upper case
		*/
		public void updateEmergencyCallButtonState(Button button, int phoneState, boolean shown,
		boolean upperCase, boolean showIcon) {
		boolean showIcon) {
		if (isEmergencyCallCapable() && shown) {
		button.setVisibility(View.VISIBLE);
		} else {
		@@ -1279,24 +1279,8 @@ public class LockPatternUtils {
		int emergencyIcon = showIcon ? R.drawable.ic_emergency : 0;
		button.setCompoundDrawablesWithIntrinsicBounds(emergencyIcon, 0, 0, 0);
		}
		if (upperCase) {
		CharSequence original = mContext.getResources().getText(textId);
		String upper = original != null ? original.toString().toUpperCase() : null;
		button.setText(upper);
		} else {
		button.setText(textId);
		}
		}

		/**
		* @deprecated
		* @param button
		* @param phoneState
		* @param shown
		*/
		public void updateEmergencyCallButtonState(Button button, int phoneState, boolean shown) {
		updateEmergencyCallButtonState(button, phoneState, shown, false, true);
		}

		/**
		* Resumes a call in progress. Typically launched from the EmergencyCall button

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/kg_status_date_font_size"
		android:textAllCaps="@bool/kg_use_all_caps"
		/>

		<TextView
		@@ -51,6 +52,7 @@
		android:textAppearance="?android:attr/textAppearance"
		android:textSize="@dimen/kg_status_line_font_size"
		android:drawablePadding="4dip"
		android:textAllCaps="@bool/kg_use_all_caps"
		/>

		</LinearLayout>
		No newline at end of file

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/kg_status_date_font_size"
		android:textAllCaps="@bool/kg_use_all_caps"
		/>

		<TextView
		@@ -53,6 +54,7 @@
		android:textAppearance="?android:attr/textAppearance"
		android:textSize="@dimen/kg_status_line_font_size"
		android:drawablePadding="4dip"
		android:textAllCaps="@bool/kg_use_all_caps"
		/>
		</LinearLayout>

+6 −3

Original line number	Diff line number	Diff line
		@@ -36,7 +36,8 @@
		android:ellipsize="marquee"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/kg_status_line_font_size"
		android:textColor="?android:attr/textColorSecondary"/>
		android:textColor="?android:attr/textColorSecondary"
		android:textAllCaps="@bool/kg_use_all_caps" />

		<LinearLayout
		android:layout_width="match_parent"
		@@ -58,7 +59,8 @@
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/kg_status_line_font_size"
		android:textColor="?android:attr/textColorSecondary"
		android:drawablePadding="8dip" />
		android:drawablePadding="8dip"
		android:textAllCaps="@bool/kg_use_all_caps" />

		<Button android:id="@+id/forgot_password_button"
		android:layout_width="0dip"
		@@ -70,7 +72,8 @@
		android:textColor="?android:attr/textColorSecondary"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:drawablePadding="8dip"
		android:visibility="gone"/>
		android:visibility="gone"
		android:textAllCaps="@bool/kg_use_all_caps" />
		</LinearLayout>

		</com.android.keyguard.EmergencyCarrierArea>

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,4 +19,5 @@
		<bool name="kg_center_small_widgets_vertically">false</bool>
		<bool name="kg_top_align_page_shrink_on_bouncer_visible">true</bool>
		<bool name="kg_show_ime_at_screen_on">true</bool>
		<bool name="kg_use_all_caps">true</bool>
		</resources>