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

Commit 614b1df0 authored by Joshua Tsuji's avatar Joshua Tsuji
Browse files

Adds the flyout view. 

This moves the view itself from BubbleView to BubbleStackView, since there will never be multiple flyouts and it simplifies layout. This also adds getUpdateMessage to NotificationEntry which is used to generate the flyout text.

Test: atest SystemUITests
Change-Id: Ief2fcfb2b12b927fdd68f737d49080335c884bef
parent e1e0528d

packages/SystemUI/res/drawable/bubble_flyout.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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

  -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

    <!-- TODO: Add the triangle pointing to the bubble stack. -->

    <item>

        <shape android:shape="rectangle">

            <solid android:color="?android:attr/colorBackgroundFloating" />

            <corners

                android:bottomLeftRadius="?android:attr/dialogCornerRadius"

                android:topLeftRadius="?android:attr/dialogCornerRadius"

                android:bottomRightRadius="?android:attr/dialogCornerRadius"

                android:topRightRadius="?android:attr/dialogCornerRadius"

            />

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/layout/bubble_flyout.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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

  -->

<FrameLayout

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

    android:id="@+id/bubble_flyout"

    android:layout_height="wrap_content"

    android:layout_width="wrap_content"

    android:background="@drawable/bubble_flyout"

    android:padding="@dimen/bubble_flyout_padding"

    android:translationZ="@dimen/bubble_flyout_elevation">



    <TextView

        android:id="@+id/bubble_flyout_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:maxLines="2"

        android:maxWidth="@dimen/bubble_flyout_maxwidth"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title" />



</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/bubble_view.xml

+0 −8
Original line number Diff line number Diff line
@@ -27,12 +27,4 @@ 
        android:padding="@dimen/bubble_view_padding"

        android:clipToPadding="false"/>



    <TextView

        android:id="@+id/message_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="@dimen/bubble_message_min_width"

        android:maxWidth="@dimen/bubble_message_max_width"

        android:padding="@dimen/bubble_message_padding"/>



</com.android.systemui.bubbles.BubbleView>

packages/SystemUI/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,12 @@ 


    <!-- How much each bubble is elevated. -->

    <dimen name="bubble_elevation">1dp</dimen>

    <!-- How much the bubble flyout text container is elevated. -->

    <dimen name="bubble_flyout_elevation">4dp</dimen>

    <!-- How much padding is around the flyout text. -->

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

    <!-- The maximum width of a bubble flyout. -->

    <dimen name="bubble_flyout_maxwidth">200dp</dimen>

    <!-- Padding around a collapsed bubble -->

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

    <!-- Padding between bubbles when displayed in expanded state -->

packages/SystemUI/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -670,6 +670,9 @@ 
        <item quantity="other"><xliff:g id="number" example="3">%s</xliff:g> more notifications inside.</item>

    </plurals>



    <!-- Format to use to summarize a message from a contact in a single line of text. For example: "Julia: How's it going?". [CHAR LIMIT=NONE] -->

    <string name="notification_summary_message_format"><xliff:g id="contact_name" example="Julia">%1$s</xliff:g>: <xliff:g id="message_content" example="How is it going?">%2$s</xliff:g></string>



    <!-- Content description of button in notification inspector for system settings relating to

         notifications from this application [CHAR LIMIT=NONE] -->

    <string name="status_bar_notification_inspect_item_title">Notification settings</string>
@@ -2401,5 +2404,4 @@ 
    <string name="bubble_accessibility_action_move_bottom_left">Move bottom left</string>

    <!-- Action in accessibility menu to move the stack of bubbles to the bottom right of the screen. [CHAR LIMIT=30]-->

    <string name="bubble_accessibility_action_move_bottom_right">Move bottom right</string>



</resources>