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

Commit c40548e6 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "plug-in-statusbar-chip" into tm-qpr-dev 

* changes:
  Add SystemStatusAnimationSchedulerTest
  Handle replacement of StatusChips in SystemStatusAnimationScheduler
  Refactor OngoingPrivacyChip inflation logic
  Migrate statusbar chip animators to androidx
  Statusbar charging animation chip when plugging in device
parents 747b4c2b 907da1cd

packages/SystemUI/res/drawable/statusbar_chip_bg.xml

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

<!--

     Copyright (C) 2023 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.

-->



<shape

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

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

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/battery_status_chip.xml

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

     Copyright (C) 2023 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.

-->





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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_gravity="center_vertical|end"

    tools:parentTag="com.android.systemui.statusbar.BatteryStatusChip">



    <LinearLayout

        android:id="@+id/rounded_container"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/ongoing_appops_chip_height"

        android:layout_gravity="center"

        android:background="@drawable/statusbar_chip_bg"

        android:clipToOutline="true"

        android:gravity="center"

        android:maxWidth="@dimen/ongoing_appops_chip_max_width"

        android:minWidth="@dimen/ongoing_appops_chip_min_width">



        <com.android.systemui.battery.BatteryMeterView

            android:id="@+id/battery_meter_view"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginHorizontal="10dp" />



    </LinearLayout>

</merge>
 
 No newline at end of file

packages/SystemUI/res/layout/combined_qs_header.xml

+7 −4
Original line number Diff line number Diff line
@@ -141,11 +141,14 @@ 
        android:layout_width="wrap_content"

        android:layout_height="@dimen/large_screen_shade_header_min_height"

        android:gravity="center"

        app:layout_constraintEnd_toEndOf="@id/end_guide"

        app:layout_constraintTop_toTopOf="@id/date"

        app:layout_constraintBottom_toBottomOf="@id/date"

        >

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

        app:layout_constraintEnd_toEndOf="@id/end_guide"

        app:layout_constraintTop_toTopOf="@id/date">



        <com.android.systemui.privacy.OngoingPrivacyChip

            android:layout_width="wrap_content"

            android:layout_height="match_parent" />



    </FrameLayout>



</com.android.systemui.util.NoRemeasureMotionLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/ongoing_privacy_chip.xml

+7 −7
Original line number Diff line number Diff line
@@ -16,16 +16,15 @@ 
-->





<com.android.systemui.privacy.OngoingPrivacyChip

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

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

    android:id="@+id/privacy_chip"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:layout_gravity="center_vertical|end"

    android:focusable="true"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingStart="8dp"

    tools:parentTag="com.android.systemui.privacy.OngoingPrivacyChip">

    >



        <LinearLayout
@@ -35,8 +34,9 @@ 
            android:paddingStart="10dp"

            android:paddingEnd="10dp"

            android:gravity="center"

            android:clipToOutline="true"

            android:clipToPadding="false"

            android:layout_gravity="center"

            android:minWidth="@dimen/ongoing_appops_chip_min_width"

            android:maxWidth="@dimen/ongoing_appops_chip_max_width"

            />

</com.android.systemui.privacy.OngoingPrivacyChip>
 
 No newline at end of file
 
            android:maxWidth="@dimen/ongoing_appops_chip_max_width" />

</merge>
 
 No newline at end of file