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

Commit c07e6f8e authored by Josh's avatar Josh
Browse files

Migrated shortcut helper bottom sheet to compose 

go/shortcut-helper-bottom-sheet-compose-migration

Test: None
Flag: com.android.systemui.keyboard_shortcut_helper_rewrite
Fixes: 366152089
Fix: 362733881
Fix: 355153229
Fix: 362730283
Fix: 362740106
Fix: 362735926
Fix: 362732358

Change-Id: I47d25c9288a7243997d60c353241914fff75073b
parent 3d404328

packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -28,8 +28,4 @@ 
    <!-- Overload default clock widget parameters -->

    <dimen name="widget_big_font_size">100dp</dimen>

    <dimen name="widget_label_font_size">18sp</dimen>



    <!-- New keyboard shortcut helper -->

    <dimen name="shortcut_helper_width">704dp</dimen>

    <dimen name="shortcut_helper_height">1208dp</dimen>

</resources>

packages/SystemUI/res/layout/activity_keyboard_shortcut_helper.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/shortcut_helper_sheet_container"

    android:layout_gravity="center_horizontal|bottom"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <FrameLayout

        android:id="@+id/shortcut_helper_sheet"

        style="@style/ShortcutHelperBottomSheet"

        android:layout_width="@dimen/shortcut_helper_width"

        android:layout_height="@dimen/shortcut_helper_height"

        android:orientation="vertical"

        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">



        <!-- Drag handle for accessibility -->

        <com.google.android.material.bottomsheet.BottomSheetDragHandleView

            android:id="@+id/drag_handle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <androidx.compose.ui.platform.ComposeView

            android:id="@+id/shortcut_helper_compose_container"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

    </FrameLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 No newline at end of file

packages/SystemUI/res/values-sw600dp-land/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 
    <dimen name="keyguard_clock_top_margin">8dp</dimen>

    <dimen name="keyguard_smartspace_top_offset">0dp</dimen>



    <!-- New keyboard shortcut helper -->

    <dimen name="shortcut_helper_width">864dp</dimen>

    <dimen name="shortcut_helper_height">728dp</dimen>



    <!-- QS-->

    <dimen name="qs_panel_padding_top">16dp</dimen>

    <dimen name="qs_panel_padding">24dp</dimen>

packages/SystemUI/res/values/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -1005,10 +1005,6 @@ 
    <dimen name="ksh_app_item_minimum_height">64dp</dimen>

    <dimen name="ksh_category_separator_margin">16dp</dimen>



    <!-- New keyboard shortcut helper -->

    <dimen name="shortcut_helper_width">412dp</dimen>

    <dimen name="shortcut_helper_height">728dp</dimen>



    <!-- The size of corner radius of the arrow in the onboarding toast. -->

    <dimen name="recents_onboarding_toast_arrow_corner_radius">2dp</dimen>

packages/SystemUI/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -3711,6 +3711,12 @@ 
         [CHAR LIMIT=NONE]

          -->

    <string name="shortcut_helper_key_combinations_or_separator">or</string>

    <!-- Content description of the drag handle that allows to swipe to dismiss the shortcut helper.

         The helper is a  component that shows the  user which keyboard shortcuts they can

         use. The helper shows shortcuts in categories, which can be collapsed or expanded.

         [CHAR LIMIT=NONE] -->

    <string name="shortcut_helper_content_description_drag_handle">Drag handle</string>





    <!-- Keyboard touchpad tutorial scheduler-->

    <!-- Notification title for launching keyboard tutorial [CHAR_LIMIT=100] -->