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

Commit ce6f860b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "caitlinshk-ongoing-call-rename" into main

* changes:
  [SB][Screen Chips] Rename call chip view-related items to be generic
  [SB][Screen Chips] Add a flag for the screen sharing chips.
parents 92df99f3 38f25acb
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -354,6 +354,14 @@ flag {
    }
}

flag {
    name: "status_bar_screen_sharing_chips"
    namespace: "systemui"
    description: "Show chips on the left side of the status bar when a user is screen sharing, "
        "recording, or casting"
    bug: "332662551"
}

flag {
    name: "compose_bouncer"
    namespace: "systemui"
+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>
+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
+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>
+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"
Loading