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

Merge "Fix accessibility for all-caps items in keyguard" into klp-dev

Browse Source
This commit is contained in:
Jim Miller
2013-09-25 21:53:40 +00:00
committed by Android (Google) Code Review
parent 82b05f599b e38c8e28ba
commit d7fdcad226
8 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -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,23 +1279,7 @@ 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);
button.setText(textId);
}
/**

2
packages/Keyguard/res/layout-land/keyguard_status_area.xml
View File

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

2
packages/Keyguard/res/layout-port/keyguard_status_area.xml
View File

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

9
packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml
View File

@@ -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
packages/Keyguard/res/values/bools.xml
View File

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

7
packages/Keyguard/src/com/android/keyguard/CarrierText.java
View File

@@ -72,12 +72,7 @@ public class CarrierText extends TextView {
}
protected void updateCarrierText(State simState, CharSequence plmn, CharSequence spn) {
CharSequence text = getCarrierTextForSimState(simState, plmn, spn);
if (KeyguardViewManager.USE_UPPER_CASE) {
setText(text != null ? text.toString().toUpperCase() : null);
} else {
setText(text);
}
setText(getCarrierTextForSimState(simState, plmn, spn));
}
@Override

3
packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
View File

@@ -127,8 +127,7 @@ public class EmergencyButton extends Button {
enabled = mLockPatternUtils.isSecure();
}
}
mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,
KeyguardViewManager.USE_UPPER_CASE, false);
mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled, false);
}
}

11
packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -116,7 +116,7 @@ public class KeyguardStatusView extends GridLayout {
// Update Alarm status
String nextAlarm = mLockPatternUtils.getNextAlarm();
if (!TextUtils.isEmpty(nextAlarm)) {
maybeSetUpperCaseText(mAlarmStatusView, nextAlarm);
mAlarmStatusView.setText(nextAlarm);
mAlarmStatusView.setCompoundDrawablesWithIntrinsicBounds(ALARM_ICON, 0, 0, 0);
mAlarmStatusView.setVisibility(View.VISIBLE);
} else {
@@ -125,7 +125,7 @@ public class KeyguardStatusView extends GridLayout {
}
void refreshDate() {
maybeSetUpperCaseText(mDateView, mDateFormat.format(new Date()));
mDateView.setText(mDateFormat.format(new Date()));
}
@Override
@@ -144,11 +144,4 @@ public class KeyguardStatusView extends GridLayout {
return LockPatternUtils.ID_DEFAULT_STATUS_WIDGET;
}
private void maybeSetUpperCaseText(TextView textView, CharSequence text) {
if (KeyguardViewManager.USE_UPPER_CASE) {
textView.setText(text != null ? text.toString().toUpperCase() : null);
} else {
textView.setText(text);
}
}
}