Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28017bde authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup usage of toUpperCase in Keyboard Shortcuts Helper"

parents 3196999a dca2d926

packages/SystemUI/res/layout/keyboard_shortcuts_key_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

            }