Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Visual updates to battery screen" into nyc-dev

Browse Source 
am: 3212a4c

* commit '3212a4c759055ba3f81848f0285b4f5fe3f3ab25':
  Visual updates to battery screen

Change-Id: Idfbbd0da48dd5090e7bd760b275586e4e174dea4
This commit is contained in:
Jason Monk
2016-04-09 00:42:11 +00:00
committed by android-build-merger
parent 9a64e3ef97 3212a4c759
commit 89affce5ec
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/battery_detail.xml
View File

@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="72dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/colorAccent" />
<com.android.systemui.ResizingSpace

22
packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java
View File

@@ -25,6 +25,7 @@ import android.os.Looper;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.RelativeSizeSpan;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnAttachStateChangeListener;
@@ -207,18 +208,21 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll
}
}
});
final TextView batterySaverTitle =
(TextView) mCurrentView.findViewById(android.R.id.title);
final TextView batterySaverSummary =
(TextView) mCurrentView.findViewById(android.R.id.summary);
if (mCharging) {
((TextView) mCurrentView.findViewById(android.R.id.title)).setText(
R.string.battery_detail_charging_summary);
mCurrentView.findViewById(android.R.id.icon).setVisibility(View.INVISIBLE);
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 {
((TextView) mCurrentView.findViewById(android.R.id.title)).setText(
R.string.battery_detail_switch_title);
((TextView) mCurrentView.findViewById(android.R.id.summary)).setText(
R.string.battery_detail_switch_summary);
mCurrentView.findViewById(android.R.id.icon).setVisibility(View.VISIBLE);
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);
@@ -227,7 +231,7 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll
private void bindBatteryInfo(BatteryInfo info) {
SpannableStringBuilder builder = new SpannableStringBuilder();
builder.append(info.batteryPercentString, new RelativeSizeSpan(2),
builder.append(info.batteryPercentString, new RelativeSizeSpan(2.6f),
Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
if (info.remainingLabel != null) {
if (mContext.getResources().getBoolean(R.bool.quick_settings_wide)) {