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

Merge \"Fix crash when tapping on cell icon in QS.\" into nyc-mr1-dev

Browse Source 
am: a9db1aa382

Change-Id: Iddda5d785c1dd2d128d2972525d03451a27c3edc
This commit is contained in:
Andrew Sapperstein
2016-06-23 18:52:40 +00:00
committed by android-build-merger
parent cd10a1fce1 a9db1aa382
commit 1629a9de43
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.qs.tiles;
import android.annotation.ColorInt;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -65,7 +66,7 @@ public class DataUsageDetailView extends LinearLayout {
final Resources res = mContext.getResources();
final int titleId;
final long bytes;
int usageColor = 0;
@ColorInt int usageColor = 0;
final String top;
String bottom = null;
if (info.usageLevel < info.warningLevel || info.limitLevel <= 0) {
@@ -90,7 +91,7 @@ public class DataUsageDetailView extends LinearLayout {
formatBytes(info.usageLevel));
bottom = res.getString(R.string.quick_settings_cellular_detail_data_limit,
formatBytes(info.limitLevel));
usageColor = R.color.system_warning_color;
usageColor = mContext.getColor(R.color.system_warning_color);
}
if (usageColor == 0) {
@@ -101,7 +102,7 @@ public class DataUsageDetailView extends LinearLayout {
title.setText(titleId);
final TextView usage = (TextView) findViewById(R.id.usage_text);
usage.setText(formatBytes(bytes));
usage.setTextColor(mContext.getColor(usageColor));
usage.setTextColor(usageColor);
final DataUsageGraph graph = (DataUsageGraph) findViewById(R.id.usage_graph);
graph.setLevels(info.limitLevel, info.warningLevel, info.usageLevel);
final TextView carrier = (TextView) findViewById(R.id.usage_carrier_text);