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

Commit dca2d926 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

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
parent e0936630

packages/SystemUI/res/layout/keyboard_shortcuts_key_view.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -23,4 +23,5 @@ 
          android:textColor="@color/ksh_key_item_color"

          android:textColor="@color/ksh_key_item_color"

          android:singleLine="true"

          android:singleLine="true"

          android:gravity="center"

          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 Original line Diff line number Diff line
@@ -697,7 +697,7 @@ public final class KeyboardShortcuts { 
        if (displayLabelDrawable != null) {

        if (displayLabelDrawable != null) {

            shortcutKeys.add(new StringOrDrawable(displayLabelDrawable));

            shortcutKeys.add(new StringOrDrawable(displayLabelDrawable));

        } else if (displayLabelString != null) {

        } else if (displayLabelString != null) {

            shortcutKeys.add(new StringOrDrawable(displayLabelString.toUpperCase()));

            shortcutKeys.add(new StringOrDrawable(displayLabelString));

        }

        }

        return shortcutKeys;

        return shortcutKeys;

    }

    }
@@ -716,7 +716,7 @@ public final class KeyboardShortcuts { 
                            mModifierDrawables.get(supportedModifier)));

                            mModifierDrawables.get(supportedModifier)));

                } else {

                } else {

                    shortcutKeys.add(new StringOrDrawable(

                    shortcutKeys.add(new StringOrDrawable(

                            mModifierNames.get(supportedModifier).toUpperCase()));

                            mModifierNames.get(supportedModifier)));

                }

                }

                modifiers &= ~supportedModifier;

                modifiers &= ~supportedModifier;

            }

            }