PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch references to colorError"

Browse Source
This commit is contained in:
Jason Monk
2017-02-24 23:29:24 +00:00
committed by Android (Google) Code Review
parent 2228aecfbb 6fca98f905
commit 5286610f59
10 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/datausage/ChartDataUsagePreference.java
View File

@@ -50,11 +50,8 @@ public class ChartDataUsagePreference extends Preference {
public ChartDataUsagePreference(Context context, AttributeSet attrs) {
super(context, attrs);
setSelectable(false);
// TODO: Resource.
mLimitColor = 0xfff4511e;
TypedArray a = context.getTheme().obtainStyledAttributes(
new int[]{android.R.attr.textColorSecondary});
mWarningColor = a.getColor(0, 0);
mLimitColor = Utils.getColorAttr(context, android.R.attr.colorError);
mWarningColor = Utils.getColorAttr(context, android.R.attr.textColorSecondary);
setLayoutResource(R.layout.data_usage_graph);
}

1
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -76,7 +76,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
private static final String TAG_DISK_INIT = "disk_init";
static final int COLOR_PUBLIC = Color.parseColor("#ff9e9e9e");
static final int COLOR_WARNING = Color.parseColor("#fff4511e");
static final int[] COLOR_PRIVATE = new int[] {
Color.parseColor("#ff26a69a"),

3
src/com/android/settings/deviceinfo/StorageVolumePreference.java
View File

@@ -32,6 +32,7 @@ import android.widget.ProgressBar;
import com.android.settings.R;
import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
import com.android.settingslib.Utils;
import java.io.File;
@@ -83,7 +84,7 @@ public class StorageVolumePreference extends Preference {
}
if (freeBytes < mStorageManager.getStorageLowBytes(path)) {
mColor = StorageSettings.COLOR_WARNING;
mColor = Utils.getColorAttr(context, android.R.attr.colorError);
icon = context.getDrawable(R.drawable.ic_warning_24dp);
}