From 50af3bccdfe7abe1ecdeb0e51b4a7df554674ccf Mon Sep 17 00:00:00 2001 From: Alex Kulesza Date: Fri, 2 Jun 2017 13:54:15 -0400 Subject: [PATCH] Remove BatteryDetail from BatterySaverTile This CL removes unused code that depends on the battery usage graph, in preparation for modifying the underlying graphing code. Bug: 38400320 Test: manual, make SystemUITests Change-Id: Ie1a99ce887ba23bef0b20155ad70c74a6a647a29 --- .../SystemUI/res/layout/battery_detail.xml | 107 ------------- .../systemui/qs/tiles/BatterySaverTile.java | 149 ------------------ 2 files changed, 256 deletions(-) delete mode 100644 packages/SystemUI/res/layout/battery_detail.xml diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml deleted file mode 100644 index 6162d650f7686..0000000000000 --- a/packages/SystemUI/res/layout/battery_detail.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java index 336c58199e996..918c00c2337fa 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java @@ -15,27 +15,12 @@ */ package com.android.systemui.qs.tiles; -import android.content.BroadcastReceiver; -import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.service.quicksettings.Tile; -import android.util.TypedValue; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnAttachStateChangeListener; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.Checkable; -import android.widget.ImageView; import android.widget.Switch; -import android.widget.TextView; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settingslib.graph.BatteryMeterDrawableBase; import com.android.systemui.Dependency; import com.android.systemui.R; -import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.plugins.qs.QSTile.BooleanState; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.tileimpl.QSTileImpl; @@ -45,12 +30,10 @@ public class BatterySaverTile extends QSTileImpl implements BatteryController.BatteryStateChangeCallback { private final BatteryController mBatteryController; - private final BatteryDetail mBatteryDetail = new BatteryDetail(); private int mLevel; private boolean mPowerSave; private boolean mCharging; - private boolean mDetailShown; private boolean mPluggedIn; public BatterySaverTile(QSHost host) { @@ -77,14 +60,6 @@ public class BatterySaverTile extends QSTileImpl implements } } - @Override - public void setDetailListening(boolean listening) { - super.setDetailListening(listening); - if (!listening) { - mBatteryDetail.mCurrentView = null; - } - } - @Override public Intent getLongClickIntent() { return new Intent(Intent.ACTION_POWER_USAGE_SUMMARY); @@ -117,135 +92,11 @@ public class BatterySaverTile extends QSTileImpl implements mPluggedIn = pluggedIn; mCharging = charging; refreshState(level); - if (mDetailShown) { - mBatteryDetail.postBindView(); - } } @Override public void onPowerSaveChanged(boolean isPowerSave) { mPowerSave = isPowerSave; refreshState(null); - if (mDetailShown) { - mBatteryDetail.postBindView(); - } - } - - private final class BatteryDetail implements DetailAdapter, OnClickListener, - OnAttachStateChangeListener { - private final BatteryMeterDrawableBase mDrawable - = new BatteryMeterDrawableBase( - mHost.getContext(), - mHost.getContext().getColor(R.color.meter_background_color)); - private View mCurrentView; - - @Override - public CharSequence getTitle() { - return mContext.getString(R.string.battery_panel_title, mLevel); - } - - @Override - public Boolean getToggleState() { - return null; - } - - @Override - public View createDetailView(Context context, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = LayoutInflater.from(mContext).inflate(R.layout.battery_detail, parent, - false); - } - mCurrentView = convertView; - mCurrentView.addOnAttachStateChangeListener(this); - bindView(); - return convertView; - } - - private void postBindView() { - if (mCurrentView == null) return; - mCurrentView.post(new Runnable() { - @Override - public void run() { - bindView(); - } - }); - } - - private void bindView() { - if (mCurrentView == null) { - return; - } - mDrawable.setBatteryLevel(100); - mDrawable.setCharging(false); - mDrawable.setPowerSave(true); - mDrawable.setShowPercent(false); - ((ImageView) mCurrentView.findViewById(android.R.id.icon)).setImageDrawable(mDrawable); - Checkable checkbox = (Checkable) mCurrentView.findViewById(android.R.id.toggle); - checkbox.setChecked(mPowerSave); - final TextView batterySaverTitle = - (TextView) mCurrentView.findViewById(android.R.id.title); - final TextView batterySaverSummary = - (TextView) mCurrentView.findViewById(android.R.id.summary); - if (mCharging) { - mCurrentView.findViewById(R.id.switch_container).setAlpha(.7f); - batterySaverTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); - batterySaverTitle.setText(R.string.battery_detail_charging_summary); - mCurrentView.findViewById(android.R.id.toggle).setVisibility(View.GONE); - mCurrentView.findViewById(R.id.switch_container).setClickable(false); - } else { - mCurrentView.findViewById(R.id.switch_container).setAlpha(1); - batterySaverTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); - batterySaverTitle.setText(R.string.battery_detail_switch_title); - batterySaverSummary.setText(R.string.battery_detail_switch_summary); - mCurrentView.findViewById(android.R.id.toggle).setVisibility(View.VISIBLE); - mCurrentView.findViewById(R.id.switch_container).setClickable(true); - mCurrentView.findViewById(R.id.switch_container).setOnClickListener(this); - } - } - - @Override - public void onClick(View v) { - mBatteryController.setPowerSaveMode(!mPowerSave); - } - - @Override - public Intent getSettingsIntent() { - return new Intent(Intent.ACTION_POWER_USAGE_SUMMARY); - } - - @Override - public void setToggleState(boolean state) { - // No toggle state. - } - - @Override - public int getMetricsCategory() { - return MetricsEvent.QS_BATTERY_DETAIL; - } - - @Override - public void onViewAttachedToWindow(View v) { - if (!mDetailShown) { - mDetailShown = true; - v.getContext().registerReceiver(mReceiver, - new IntentFilter(Intent.ACTION_TIME_TICK), null, - Dependency.get(Dependency.TIME_TICK_HANDLER)); - } - } - - @Override - public void onViewDetachedFromWindow(View v) { - if (mDetailShown) { - mDetailShown = false; - v.getContext().unregisterReceiver(mReceiver); - } - } - - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - postBindView(); - } - }; } } \ No newline at end of file