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

Commit 38f25acb authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Screen Chips] Rename call chip view-related items to be generic 

This updates the view-related items for the ongoing call chip to be
generically named "ongoing activity chip" since we're going to reuse the
chip view for other activities that aren't ongoing calls.

It also moves the view-related classes to a new package:
`statusbar.chips.ui.view`.

Bug: 332662551
Test: atest ChipChronometerTest ChipBackgroundContainerTest
CollapsedStatusBarFragmentTest OngoingCallControllerTest
Test: verify ongoing call chip still works
Flag: NONE (just renames)

Change-Id: I4f1179a43a6c69d9b885f2dfa1c0c8de27696015
parent 3e160aac

packages/SystemUI/res-keyguard/drawable/status_bar_user_chip_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 


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

    <solid android:color="@color/material_dynamic_neutral20" />

    <corners android:radius="@dimen/ongoing_call_chip_corner_radius" />

    <corners android:radius="@dimen/ongoing_activity_chip_corner_radius" />

</shape>

packages/SystemUI/res/drawable/ongoing_call_chip_bg.xml→packages/SystemUI/res/drawable/ongoing_activity_chip_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 


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

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

    <corners android:radius="@dimen/ongoing_call_chip_corner_radius" />

    <corners android:radius="@dimen/ongoing_activity_chip_corner_radius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/ongoing_call_chip.xml→packages/SystemUI/res/layout/ongoing_activity_chip.xml

+14 −12
Original line number Diff line number Diff line
@@ -17,43 +17,45 @@ 
     the chip. -->

<FrameLayout

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

    android:id="@+id/ongoing_call_chip"

    android:id="@+id/ongoing_activity_chip"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_gravity="center_vertical|start"

    android:layout_marginStart="5dp"

>

    <com.android.systemui.statusbar.phone.ongoingcall.OngoingCallBackgroundContainer

        android:id="@+id/ongoing_call_chip_background"

    <!-- TODO(b/332662551): Update this content description when this supports more than just

         phone calls. -->

    <com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

        android:id="@+id/ongoing_activity_chip_background"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/ongoing_appops_chip_height"

        android:layout_gravity="center_vertical"

        android:gravity="center"

        android:background="@drawable/ongoing_call_chip_bg"

        android:paddingStart="@dimen/ongoing_call_chip_side_padding"

        android:paddingEnd="@dimen/ongoing_call_chip_side_padding"

        android:background="@drawable/ongoing_activity_chip_bg"

        android:paddingStart="@dimen/ongoing_activity_chip_side_padding"

        android:paddingEnd="@dimen/ongoing_activity_chip_side_padding"

        android:contentDescription="@string/ongoing_phone_call_content_description"

        android:minWidth="@dimen/min_clickable_item_size"

    >



        <ImageView

            android:src="@*android:drawable/ic_phone"

            android:layout_width="@dimen/ongoing_call_chip_icon_size"

            android:layout_height="@dimen/ongoing_call_chip_icon_size"

            android:layout_width="@dimen/ongoing_activity_chip_icon_size"

            android:layout_height="@dimen/ongoing_activity_chip_icon_size"

            android:tint="?android:attr/colorPrimary"

        />



        <com.android.systemui.statusbar.phone.ongoingcall.OngoingCallChronometer

            android:id="@+id/ongoing_call_chip_time"

        <com.android.systemui.statusbar.chips.ui.view.ChipChronometer

            android:id="@+id/ongoing_activity_chip_time"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:gravity="center|start"

            android:paddingStart="@dimen/ongoing_call_chip_icon_text_padding"

            android:paddingStart="@dimen/ongoing_activity_chip_icon_text_padding"

            android:textAppearance="@android:style/TextAppearance.Material.Small"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:textColor="?android:attr/colorPrimary"

        />



    </com.android.systemui.statusbar.phone.ongoingcall.OngoingCallBackgroundContainer>

    </com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer>

</FrameLayout>

packages/SystemUI/res/layout/status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
                        android:gravity="center_vertical|start"

                    />



                    <include layout="@layout/ongoing_call_chip" />

                    <include layout="@layout/ongoing_activity_chip" />



                    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

                        android:id="@+id/notification_icon_area"

packages/SystemUI/res/values/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -1713,12 +1713,12 @@ 
    <dimen name="wallet_button_horizontal_padding">24dp</dimen>

    <dimen name="wallet_button_vertical_padding">8dp</dimen>



    <!-- Ongoing call chip -->

    <dimen name="ongoing_call_chip_side_padding">12dp</dimen>

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

    <!-- Ongoing activity chip -->

    <dimen name="ongoing_activity_chip_side_padding">12dp</dimen>

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

    <!-- The padding between the icon and the text. -->

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

    <dimen name="ongoing_call_chip_corner_radius">28dp</dimen>

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

    <dimen name="ongoing_activity_chip_corner_radius">28dp</dimen>



    <!-- Status bar user chip -->

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