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

Commit 8b0c965f authored by Gopal G Goberu's avatar Gopal G Goberu
Browse files

Merge commit 'ebdeb4ff' 

Conflicts:
	services/core/java/com/android/server/wm/WindowAnimator.java

Change-Id: I8a08da3239540282b8191166774aa3a0e0823fee
parents 30b4dfa2 ebdeb4ff

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

+8 −2
Original line number Diff line number Diff line
@@ -342,12 +342,18 @@ public class BatteryMeterView extends View implements DemoMode, 


    @Override

    public void draw(Canvas c) {

        final boolean showChargingAnim

                 = mContext.getResources().getBoolean(R.bool.config_show_battery_charging_anim);

        BatteryTracker tracker = mDemoMode ? mDemoTracker : mTracker;

        final int level =

                mContext.getResources().getBoolean(R.bool.config_show_battery_charging_anim)



        final int level = showChargingAnim

                ? updateChargingAnimLevel(tracker)

                : tracker.level;



        if (showChargingAnim && getLayerType() != View.LAYER_TYPE_SOFTWARE) {

            setLayerType(View.LAYER_TYPE_SOFTWARE, null);

        }



        if (level == BatteryTracker.UNKNOWN_LEVEL) return;



        float drawFrac = (float) level / 100f;

services/core/java/com/android/server/wm/WindowAnimator.java

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Debug; 
import android.os.Handler;

import android.os.SystemClock;

import android.provider.Settings;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseIntArray;