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

Commit 20d12f1c authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge changes from topic "retrieve-bubble" into main 

* changes:
  Animate bubble overflow when it opens from a shortcut
  Create a shortcut to open bubbles
parents 113fdab2 fe4a1db2

libs/WindowManager/Shell/AndroidManifest.xml

+24 −0
Original line number Diff line number Diff line
@@ -30,5 +30,29 @@ 
            android:excludeFromRecents="true"

            android:launchMode="singleInstance"

            android:theme="@style/DesktopWallpaperTheme" />



        <activity

            android:name=".bubbles.shortcut.CreateBubbleShortcutActivity"

            android:exported="true"

            android:excludeFromRecents="true"

            android:theme="@android:style/Theme.NoDisplay"

            android:label="Bubbles"

            android:icon="@drawable/ic_bubbles_shortcut_widget">

            <intent-filter>

                <action android:name="android.intent.action.CREATE_SHORTCUT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity

            android:name=".bubbles.shortcut.ShowBubblesActivity"

            android:exported="true"

            android:excludeFromRecents="true"

            android:theme="@android:style/Theme.NoDisplay" >

            <intent-filter>

                <action android:name="com.android.wm.shell.bubbles.action.SHOW_BUBBLES"/>

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

    </application>

</manifest>

libs/WindowManager/Shell/res/drawable/ic_bubbles_shortcut_widget.xml

0 → 100644
+19 −0
Original line number 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.

  -->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@drawable/ic_bubbles_shortcut_widget_background" />

    <foreground android:drawable="@drawable/ic_bubbles_shortcut_widget_foreground" />

</adaptive-icon>

libs/WindowManager/Shell/res/drawable/ic_bubbles_shortcut_widget_background.xml

0 → 100644
+24 −0
Original line number 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.

  -->

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

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M0,0h108v108h-108z"

      android:fillColor="#FFC20C"/>

</vector>

libs/WindowManager/Shell/res/drawable/ic_bubbles_shortcut_widget_foreground.xml

0 → 100644
+36 −0
Original line number 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.

  -->

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

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="@android:color/white">

  <group android:scaleX="0.58"

      android:scaleY="0.58"

      android:translateX="5.04"

      android:translateY="5.04">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M7.2,14.4m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>

    <path

        android:fillColor="@android:color/white"

        android:pathData="M14.8,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>

    <path

        android:fillColor="@android:color/white"

        android:pathData="M15.2,8.8m-4.8,0a4.8,4.8 0,1 1,9.6 0a4.8,4.8 0,1 1,-9.6 0"/>

  </group>

</vector>
 
 No newline at end of file

libs/WindowManager/Shell/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -182,6 +182,12 @@ 
    <!-- Content description to tell the user a bubble has been dismissed. -->

    <string name="accessibility_bubble_dismissed">Bubble dismissed.</string>



    <!-- Label used to for bubbles shortcut [CHAR_LIMIT=10] -->

    <string name="bubble_shortcut_label">Bubbles</string>



    <!-- Longer label used to for bubbles shortcut, shown if there is enough space [CHAR_LIMIT=25] -->

    <string name="bubble_shortcut_long_label">Show Bubbles</string>



    <!-- Description of the restart button in the hint of size compatibility mode. [CHAR LIMIT=NONE] -->

    <string name="restart_button_description">Tap to restart this app for a better view</string>