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

Commit 7acf668f authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Cleanup." into cm-10.1

parents 10d83fd6 c8b337f0

packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java

+23 −25
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package com.android.systemui.quicksettings; 
import android.content.Context;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LevelListDrawable;

import android.os.BatteryManager;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;
@@ -18,12 +18,9 @@ import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChang 
public class BatteryTile extends QuickSettingsTile implements BatteryStateChangeCallback{

    private BatteryController mController;



    private boolean charging = false;

    private int batteryLevel = 0;

    private Drawable batteryIcon;



    private LevelListDrawable batteryLevels;

    private LevelListDrawable chargingBatteryLevels;

    private int mBatteryLevel = 0;

    private int mBatteryStatus;

    private Drawable mBatteryIcon;



    public BatteryTile(Context context, QuickSettingsController qsc, BatteryController controller) {

        super(context, qsc, R.layout.quick_settings_tile_battery);
@@ -52,9 +49,9 @@ public class BatteryTile extends QuickSettingsTile implements BatteryStateChange 
    }



    @Override

    public void onBatteryLevelChanged(int level, boolean pluggedIn) {

        batteryLevel = level;

        charging = pluggedIn;

    public void onBatteryLevelChanged(int level, int status) {

        mBatteryLevel = level;

        mBatteryStatus = status;

        updateResources();

    }
@@ -65,29 +62,30 @@ public class BatteryTile extends QuickSettingsTile implements BatteryStateChange 
    }



    private synchronized void updateTile() {

        batteryLevels = (LevelListDrawable) mContext.getResources().getDrawable(R.drawable.qs_sys_battery);

        chargingBatteryLevels = (LevelListDrawable) mContext.getResources().getDrawable(R.drawable.qs_sys_battery_charging);

        batteryIcon = charging

                ? chargingBatteryLevels :

                    batteryLevels;

        if(batteryLevel == 100) {

        final int drawableResId = mBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING

                ? R.drawable.qs_sys_battery_charging : R.drawable.qs_sys_battery;



        mBatteryIcon = mContext.getResources().getDrawable(drawableResId);



        if (mBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) {

            mLabel = mContext.getString(R.string.quick_settings_battery_charged_label);

        } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING) {

            mLabel = mContext.getString(R.string.quick_settings_battery_charging_label,

                    mBatteryLevel);

        } else {

            mLabel = charging

                    ? mContext.getString(R.string.quick_settings_battery_charging_label,

                            batteryLevel)

                    : mContext.getString(R.string.status_bar_settings_battery_meter_format,

                            batteryLevel);

            mLabel = mContext.getString(R.string.status_bar_settings_battery_meter_format,

                    mBatteryLevel);

        }

    }



    @Override

    void updateQuickSettings() {

        TextView tv = (TextView) mTile.findViewById(R.id.battery_textview);

        tv.setText(mLabel);

        ImageView iv = (ImageView) mTile.findViewById(R.id.battery_image);

        iv.setImageDrawable(batteryIcon);

        iv.setImageLevel(batteryLevel);



        tv.setText(mLabel);

        iv.setImageDrawable(mBatteryIcon);

        iv.setImageLevel(mBatteryLevel);

    }



}

packages/SystemUI/src/com/android/systemui/quicksettings/DockBatteryTile.java

+16 −19
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package com.android.systemui.quicksettings; 
import android.content.Context;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LevelListDrawable;

import android.os.BatteryManager;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;
@@ -18,13 +18,10 @@ import com.android.systemui.statusbar.policy.DockBatteryController.DockBatterySt 
public class DockBatteryTile extends QuickSettingsTile implements DockBatteryStateChangeCallback {

    private DockBatteryController mController;

    private boolean mPresent = false;

    private boolean mCharging = false;

    private int mDockBatteryLevel = 0;

    private int mDockBatteryStatus;

    private Drawable mDockBatteryIcon;



    private LevelListDrawable mDockBatteryLevels;

    private LevelListDrawable mChargingDockBatteryLevels;



    public DockBatteryTile(Context context, QuickSettingsController qsc, DockBatteryController controller) {

        super(context, qsc, R.layout.quick_settings_tile_dock_battery);
@@ -52,9 +49,9 @@ public class DockBatteryTile extends QuickSettingsTile implements DockBatterySta 
    }



    @Override

    public void onDockBatteryLevelChanged(int level, boolean present, boolean pluggedIn) {

    public void onDockBatteryLevelChanged(int level, boolean present, int status) {

        mDockBatteryLevel = level;

        mCharging = pluggedIn;

        mDockBatteryStatus = status;

        mPresent = present;

        updateResources();

    }
@@ -66,19 +63,19 @@ public class DockBatteryTile extends QuickSettingsTile implements DockBatterySta 
    }



    private synchronized void updateTile() {

        int drawableResId = mDockBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING

                ? R.drawable.qs_sys_dock_battery_charging : R.drawable.qs_sys_dock_battery;



        mTile.setVisibility(mPresent ? View.VISIBLE : View.GONE);

        mDockBatteryLevels = (LevelListDrawable) mContext.getResources().getDrawable(R.drawable.qs_sys_dock_battery);

        mChargingDockBatteryLevels = (LevelListDrawable) mContext.getResources().getDrawable(R.drawable.qs_sys_dock_battery_charging);

        mDockBatteryIcon = mCharging

                ? mChargingDockBatteryLevels :

                  mDockBatteryLevels;

        if(mDockBatteryLevel == 100) {

        mDockBatteryIcon = mContext.getResources().getDrawable(drawableResId);



        if (mDockBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) {

            mLabel = mContext.getString(R.string.quick_settings_battery_charged_label);

        } else if (mDockBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING) {

            mLabel = mContext.getString(R.string.quick_settings_battery_charging_label,

                    mDockBatteryLevel);

        } else {

            mLabel = mCharging

                    ? mContext.getString(R.string.quick_settings_battery_charging_label,

                            mDockBatteryLevel)

                    : mContext.getString(R.string.status_bar_settings_battery_meter_format,

            mLabel = mContext.getString(R.string.status_bar_settings_battery_meter_format,

                    mDockBatteryLevel);

        }

    }

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

+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ import com.android.systemui.statusbar.NotificationData.Entry; 
import com.android.systemui.statusbar.SignalClusterView;

import com.android.systemui.statusbar.StatusBarIconView;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.CircleBattery;

import com.android.systemui.statusbar.policy.CircleDockBattery;

import com.android.systemui.statusbar.policy.DockBatteryController;

import com.android.systemui.statusbar.policy.BluetoothController;

import com.android.systemui.statusbar.policy.DateView;
@@ -607,6 +609,10 @@ public class PhoneStatusBar extends BaseStatusBar { 
        mBatteryController.addIconView((ImageView)mStatusBarView.findViewById(R.id.battery));

        mBatteryController.addLabelView((TextView)mStatusBarView.findViewById(R.id.battery_text));



        final CircleBattery circleBattery =

                (CircleBattery) mStatusBarView.findViewById(R.id.circle_battery);

        mBatteryController.addStateChangedCallback(circleBattery);



        // Dock Battery support

        mHasDockBattery = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_hasDockBattery);
@@ -617,6 +623,12 @@ public class PhoneStatusBar extends BaseStatusBar { 
                    (ImageView)mStatusBarView.findViewById(R.id.dock_battery));

            mDockBatteryController.addLabelView(

                    (TextView)mStatusBarView.findViewById(R.id.dock_battery_text));



            final CircleDockBattery dockCircleBattery =

                    (CircleDockBattery) mStatusBarView.findViewById(R.id.circle_dock_battery);

            final DockBatteryController.DockBatteryStateChangeCallback callback =

                    (DockBatteryController.DockBatteryStateChangeCallback) dockCircleBattery;

            mDockBatteryController.addStateChangedCallback(callback);

        } else {

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

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

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

+3 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.database.ContentObserver; 
import android.graphics.drawable.Drawable;

import android.hardware.display.WifiDisplayStatus;

import android.net.ConnectivityManager;

import android.os.BatteryManager;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;
@@ -509,9 +510,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
    }

    // BatteryController callback

    @Override

    public void onBatteryLevelChanged(int level, boolean pluggedIn) {

    public void onBatteryLevelChanged(int level, int status) {

        mBatteryState.batteryLevel = level;

        mBatteryState.pluggedIn = pluggedIn;

        mBatteryState.pluggedIn = status == BatteryManager.BATTERY_STATUS_CHARGING;

        mBatteryCallback.refreshView(mBatteryTile, mBatteryState);

    }

    void refreshBatteryTile() {

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

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class BatteryController extends BroadcastReceiver { 
            new ArrayList<BatteryStateChangeCallback>();



    public interface BatteryStateChangeCallback {

        public void onBatteryLevelChanged(int level, boolean pluggedIn);

        public void onBatteryLevelChanged(int level, int status);

    }



    public BatteryController(Context context) {
@@ -120,7 +120,7 @@ public class BatteryController extends BroadcastReceiver { 
    public void addStateChangedCallback(BatteryStateChangeCallback cb) {

        mChangeCallbacks.add(cb);

        // trigger initial update

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

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

    }



    public void removeStateChangedCallback(BatteryStateChangeCallback cb) {
@@ -209,7 +209,7 @@ public class BatteryController extends BroadcastReceiver { 
        }



        for (BatteryStateChangeCallback cb : mChangeCallbacks) {

            cb.onBatteryLevelChanged(level, isBatteryStatusCharging());

            cb.onBatteryLevelChanged(level, getBatteryStatus());

        }

    }