Cleanup usage of toUpperCase in Keyboard Shortcuts Helper

The current approach may lead to some cases being dropped, it is
easier to just apply it to the view's properties.

Change-Id: I7c9c171858f7fc1844d0c4250df583d93a3443ba
This commit is contained in:
Clara Bayarri
2016-06-13 14:14:12 +01:00
parent e0936630e0
commit dca2d926f7
2 changed files with 4 additions and 3 deletions

View File

@@ -23,4 +23,5 @@
android:textColor="@color/ksh_key_item_color"
android:singleLine="true"
android:gravity="center"
android:textSize="@dimen/ksh_item_text_size"/>
android:textSize="@dimen/ksh_item_text_size"
android:textAllCaps="true" />

View File

@@ -697,7 +697,7 @@ public final class KeyboardShortcuts {
if (displayLabelDrawable != null) {
shortcutKeys.add(new StringOrDrawable(displayLabelDrawable));
} else if (displayLabelString != null) {
shortcutKeys.add(new StringOrDrawable(displayLabelString.toUpperCase()));
shortcutKeys.add(new StringOrDrawable(displayLabelString));
}
return shortcutKeys;
}
@@ -716,7 +716,7 @@ public final class KeyboardShortcuts {
mModifierDrawables.get(supportedModifier)));
} else {
shortcutKeys.add(new StringOrDrawable(
mModifierNames.get(supportedModifier).toUpperCase()));
mModifierNames.get(supportedModifier)));
}
modifiers &= ~supportedModifier;
}