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

Commit 4ff216e8 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix dock battery tile display." into cm-10.1

parents bdf172e3 fafa30d4

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java

+10 −6
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class BatteryController extends BroadcastReceiver { 
    public void addStateChangedCallback(BatteryStateChangeCallback cb) {

        mChangeCallbacks.add(cb);

        // trigger initial update

        cb.onBatteryLevelChanged(mBatteryLevel, isBatteryStatusCharging());

        cb.onBatteryLevelChanged(getBatteryLevel(), isBatteryStatusCharging());

    }



    public void removeStateChangedCallback(BatteryStateChangeCallback cb) {
@@ -144,6 +144,10 @@ public class BatteryController extends BroadcastReceiver { 
        return R.drawable.stat_sys_battery_charge_min;

    }



    protected int getBatteryLevel() {

        return mBatteryLevel;

    }



    protected int getBatteryStyle() {

        return mBatteryStyle;

    }
@@ -188,24 +192,24 @@ public class BatteryController extends BroadcastReceiver { 
    }



    protected void updateViews() {

        int level = getBatteryLevel();

        if (mUiController) {

            int N = mIconViews.size();

            for (int i=0; i<N; i++) {

                ImageView v = mIconViews.get(i);

                v.setImageLevel(mBatteryLevel);

                v.setImageLevel(level);

                v.setContentDescription(mContext.getString(R.string.accessibility_battery_level,

                        mBatteryLevel));

                        level));

            }

            N = mLabelViews.size();

            for (int i=0; i<N; i++) {

                TextView v = mLabelViews.get(i);

                v.setText(mContext.getString(BATTERY_TEXT_STYLE_MIN,

                        mBatteryLevel));

                v.setText(mContext.getString(BATTERY_TEXT_STYLE_MIN, level));

            }

        }



        for (BatteryStateChangeCallback cb : mChangeCallbacks) {

            cb.onBatteryLevelChanged(mBatteryLevel, isBatteryStatusCharging());

            cb.onBatteryLevelChanged(level, isBatteryStatusCharging());

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/policy/DockBatteryController.java

+7 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class DockBatteryController extends BatteryController { 
        }



        for (DockBatteryStateChangeCallback cb : mChangeCallbacks) {

            cb.onDockBatteryLevelChanged(mBatteryLevel, isBatteryPresent(), isBatteryStatusCharging());

            cb.onDockBatteryLevelChanged(getBatteryLevel(), isBatteryPresent(), isBatteryStatusCharging());

        }

    }
@@ -76,7 +76,7 @@ public class DockBatteryController extends BatteryController { 
    public void addStateChangedCallback(DockBatteryStateChangeCallback cb) {

        mChangeCallbacks.add(cb);

        // trigger initial update

        cb.onDockBatteryLevelChanged(mBatteryLevel, isBatteryPresent(), isBatteryStatusCharging());

        cb.onDockBatteryLevelChanged(getBatteryLevel(), isBatteryPresent(), isBatteryStatusCharging());

    }



    public void removeStateChangedCallback(DockBatteryStateChangeCallback cb) {
@@ -104,6 +104,11 @@ public class DockBatteryController extends BatteryController { 
        return R.drawable.stat_sys_kb_battery_charge_min;

    }



    @Override

    protected int getBatteryLevel() {

        return mBatteryLevel;

    }



    @Override

    protected int getBatteryStatus() {

        return mDockBatteryStatus;