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

Commit 3b77658d authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Statusbar charging animation chip when plugging in device am: bd502db5 am:... 

Statusbar charging animation chip when plugging in device am: bd502db5 am: fba275cc am: 9bc67ed5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20920032



Change-Id: I960fd2318b97609fc49c674198f293cc2282185c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b0f915e 9bc67ed5

packages/SystemUI/res/drawable/statusbar_chip_bg.xml

0 → 100644
+23 −0
Original line number Original line 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 Original line 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/ongoing_privacy_chip.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,10 +22,8 @@ 
    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_gravity="center_vertical|end"

    android:layout_gravity="center_vertical|end"

    android:focusable="true"

    android:clipChildren="false"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:clipToPadding="false"

    android:paddingStart="8dp"

    >

    >





        <LinearLayout

        <LinearLayout
@@ -35,6 +33,8 @@ 
            android:paddingStart="10dp"

            android:paddingStart="10dp"

            android:paddingEnd="10dp"

            android:paddingEnd="10dp"

            android:gravity="center"

            android:gravity="center"

            android:clipToOutline="true"

            android:clipToPadding="false"

            android:layout_gravity="center"

            android:layout_gravity="center"

            android:minWidth="@dimen/ongoing_appops_chip_min_width"

            android:minWidth="@dimen/ongoing_appops_chip_min_width"

            android:maxWidth="@dimen/ongoing_appops_chip_max_width"

            android:maxWidth="@dimen/ongoing_appops_chip_max_width"

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
import android.animation.LayoutTransition;

import android.animation.LayoutTransition;

import android.animation.ObjectAnimator;

import android.animation.ObjectAnimator;

import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;
@@ -195,7 +196,13 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
        return false;

        return false;

    }

    }





    void onBatteryLevelChanged(int level, boolean pluggedIn) {

    /**

     * Update battery level

     *

     * @param level     int between 0 and 100 (representing percentage value)

     * @param pluggedIn whether the device is plugged in or not

     */

    public void onBatteryLevelChanged(@IntRange(from = 0, to = 100) int level, boolean pluggedIn) {

        mDrawable.setCharging(pluggedIn);

        mDrawable.setCharging(pluggedIn);

        mDrawable.setBatteryLevel(level);

        mDrawable.setBatteryLevel(level);

        mCharging = pluggedIn;

        mCharging = pluggedIn;