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

Commit bd68dd08 authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

Merge changes I197e4cfa,Ie9930437 into main 

* changes:
  Create ACONFIG flag for the keyboard shortcut helper rewrite feature
  Shortcut Helper - "Scaffold" implementation
parents c7a39d68 bdc51f36

packages/SystemUI/AndroidManifest.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -1036,6 +1036,7 @@ 




        <receiver

        <receiver

            android:name=".statusbar.KeyboardShortcutsReceiver"

            android:name=".statusbar.KeyboardShortcutsReceiver"

            android:visibleToInstantApps="true"

            android:exported="true">

            android:exported="true">

            <intent-filter>

            <intent-filter>

                <action android:name="com.android.intent.action.DISMISS_KEYBOARD_SHORTCUTS" />

                <action android:name="com.android.intent.action.DISMISS_KEYBOARD_SHORTCUTS" />
@@ -1116,5 +1117,11 @@ 
                android:name="android.service.dream"

                android:name="android.service.dream"

                android:resource="@xml/home_controls_dream_metadata" />

                android:resource="@xml/home_controls_dream_metadata" />

        </service>

        </service>



        <activity android:name="com.android.systemui.keyboard.shortcut.ShortcutHelperActivity"

            android:exported="false"

            android:theme="@style/ShortcutHelperTheme"

            android:excludeFromRecents="true"

            android:finishOnCloseSystemDialogs="true" />

    </application>

    </application>

</manifest>
 
</manifest>

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -775,6 +775,13 @@ flag { 
    bug: "324600132"

    bug: "324600132"

}

}





flag {

    name: "keyboard_shortcut_helper_rewrite"

    namespace: "systemui"

    description: "A new implementation of the keyboards shortcuts helper sheet."

    bug: "327364197"

}



flag {

flag {

  name: "dream_overlay_bouncer_swipe_direction_filtering"

  name: "dream_overlay_bouncer_swipe_direction_filtering"

  namespace: "systemui"

  namespace: "systemui"

packages/SystemUI/res/anim/shortcut_helper_close_anim.xml

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

<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:interpolator="@android:anim/accelerate_interpolator"

    android:zAdjustment="top">



    <translate

        android:fromYDelta="0"

        android:toYDelta="100%"

        android:duration="@android:integer/config_shortAnimTime" />

</set>

packages/SystemUI/res/anim/shortcut_helper_launch_anim.xml

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

<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<!-- Animation for when a dock window at the bottom of the screen is entering. -->

<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:interpolator="@android:anim/accelerate_decelerate_interpolator"

    android:zAdjustment="top">



    <translate android:fromYDelta="100%"

        android:toYDelta="0"

        android:startOffset="@android:integer/config_shortAnimTime"

        android:duration="@android:integer/config_mediumAnimTime"/>

</set>

packages/SystemUI/res/layout/activity_keyboard_shortcut_helper.xml

0 → 100644
+31 −0
Original line number Original line 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_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:id="@+id/shortcut_helper_sheet"

        style="@style/Widget.Material3.BottomSheet"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        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" />



        <TextView

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:gravity="center"

            android:textAppearance="?textAppearanceDisplayLarge"

            android:background="?colorTertiaryContainer"

            android:text="Shortcut Helper Content" />

    </LinearLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>