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

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

Merge changes Id13737b3,I56745059 into cm-10.2 

* changes:
  Fix misspelled comment
  Fix removal of dock battery views in PhoneStatusBar
parents b22d67e6 98dab839

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+5 −7
Original line number Diff line number Diff line
@@ -640,13 +640,11 @@ public class PhoneStatusBar extends BaseStatusBar { 
                    (DockBatteryController.DockBatteryStateChangeCallback) mCircleDockBattery;

            mDockBatteryController.addStateChangedCallback(callback);

        } else {

            // Remove dock battery icons if device doesn't hava dock battery support

            View v = mStatusBarView.findViewById(R.id.dock_battery);

            if (v != null) mStatusBarView.removeView(v);

            v = mStatusBarView.findViewById(R.id.dock_battery_text);

            if (v != null) mStatusBarView.removeView(v);

            v = mStatusBarView.findViewById(R.id.circle_dock_battery);

            if (v != null) mStatusBarView.removeView(v);

            // Remove dock battery icons if the device doesn't have dock battery support

            ViewGroup cluster = (ViewGroup) mStatusBarView.findViewById(R.id.signal_battery_cluster);

            cluster.removeView(cluster.findViewById(R.id.dock_battery));

            cluster.removeView(cluster.findViewById(R.id.dock_battery_text));

            cluster.removeView(cluster.findViewById(R.id.circle_dock_battery));

            mCircleDockBattery = null;

        }