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

Commit 702da9b5 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "[Expressive Battery] Tweak the animation of Battery Usage screen." into main

parents 7dfbf6c9 c369a8df

res/layout/battery_chart_graph.xml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
            android:layout_height="@dimen/chartview_layout_height"

            android:layout_marginBottom="16dp"

            android:visibility="gone"

            android:alpha="0"

            android:contentDescription="@string/hourly_battery_usage_chart"

            android:textAppearance="?android:attr/textAppearanceSmall"

            settings:textColor="?android:attr/textColorSecondary" />

src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java

+9 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.util.Pair; 
import androidx.annotation.VisibleForTesting;

import androidx.loader.app.LoaderManager;

import androidx.loader.content.Loader;

import androidx.preference.PreferenceScreen;

import androidx.recyclerview.widget.RecyclerView;



import com.android.settings.R;

import com.android.settings.SettingsActivity;
@@ -149,6 +151,13 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        }

    }



    @Override

    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {

        final RecyclerView.Adapter adapter = super.onCreateAdapter(preferenceScreen);

        adapter.setHasStableIds(true);

        return adapter;

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();