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

Commit b9f3c29f authored by Joshua Mokut's avatar Joshua Mokut Committed by Android (Google) Code Review
Browse files

Merge "minor refactoring" into main

parents 6c99a727 2671b65f

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/CustomShortcutCategoriesRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ constructor( 
    private fun fetchGroupLabelByGestureType(

        @KeyGestureEvent.KeyGestureType keyGestureType: Int

    ): String? {

        InputGestures.gestureToInternalKeyboardShortcutGroupLabelMap[keyGestureType]?.let {

        InputGestures.gestureToInternalKeyboardShortcutGroupLabelResIdMap[keyGestureType]?.let {

            return context.getString(it)

        } ?: return null

    }
@@ -156,7 +156,7 @@ constructor( 
    private fun fetchShortcutInfoLabelByGestureType(

        @KeyGestureEvent.KeyGestureType keyGestureType: Int

    ): String? {

        InputGestures.gestureToInternalKeyboardShortcutInfoLabelMap[keyGestureType]?.let {

        InputGestures.gestureToInternalKeyboardShortcutInfoLabelResIdMap[keyGestureType]?.let {

            return context.getString(it)

        } ?: return null

    }

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/InputGestures.kt

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ object InputGestures { 
            KEY_GESTURE_TYPE_LAUNCH_DEFAULT_MESSAGING to AppCategories,

        )



    val gestureToInternalKeyboardShortcutGroupLabelMap =

    val gestureToInternalKeyboardShortcutGroupLabelResIdMap =

        mapOf(

            // System Category

            KEY_GESTURE_TYPE_HOME to R.string.shortcut_helper_category_system_controls,
@@ -129,7 +129,7 @@ object InputGestures { 
                R.string.keyboard_shortcut_group_applications,

        )



    val gestureToInternalKeyboardShortcutInfoLabelMap =

    val gestureToInternalKeyboardShortcutInfoLabelResIdMap =

        mapOf(

            // System Category

            KEY_GESTURE_TYPE_HOME to R.string.group_system_access_home_screen,