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

Switch references to colorError

Browse Source 
Test: make
Change-Id: I0ed10d78763642cecc5ba8e8e15a097d51280946
This commit is contained in:
Jason Monk
2017-02-01 20:20:44 -05:00
parent 3cac802860
commit 6fca98f905
10 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/color/storage_wizard_button_red.xml
View File

@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:alpha="?android:attr/disabledAlpha"
android:color="#fff4511e" />
<item android:color="#fff4511e" />
android:color="?android:attr/colorError" />
<item android:color="?android:attr/colorError" />
</selector>

6
res/drawable/ic_fingerprint_error.xml
View File

@@ -19,12 +19,12 @@
android:viewportWidth="32.0"
android:viewportHeight="32.0">
<path
android:fillColor="@*android:color/system_error"
android:fillColor="?android:attr/colorError"
android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>
<path
android:fillColor="@*android:color/system_error"
android:fillColor="?android:attr/colorError"
android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>
<path
android:fillColor="@*android:color/system_error"
android:fillColor="?android:attr/colorError"
android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>
</vector>

2
res/layout/data_usage_chart.xml
View File

@@ -80,7 +80,7 @@
settings:neighborMargin="5dip"
settings:labelSize="60dip"
settings:labelTemplate="@string/data_usage_sweep_limit"
settings:labelColor="#fff4511e"
settings:labelColor="?android:attr/colorError"
settings:safeRegion="4dp" />
</com.android.settings.widget.ChartDataUsageView>

2
res/layout/zen_rule_name.xml
View File

@@ -40,7 +40,7 @@
android:singleLine="true"
android:layout_marginLeft="26dp"
android:layout_marginRight="26dp"
android:textColor="@color/zen_rule_name_warning"
android:textColor="?android:attr/colorError"
android:text="@string/zen_mode_rule_name_warning" />
</LinearLayout>

5
res/values/colors.xml
View File

@@ -37,18 +37,15 @@
<color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
<color name="setup_lock_pattern_view_success_color_light">@color/suw_color_accent_light</color>
<color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
<color name="setup_lock_pattern_view_error_color_light">@color/lock_pattern_view_error_color</color>
<color name="setup_wizard_wifi_color_dark">#89ffffff</color>
<color name="setup_wizard_wifi_color_light">#89000000</color>
<color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color>
<color name="lock_pattern_view_error_color">@*android:color/system_error</color>
<color name="lock_pattern_view_regular_color_dark">#ffffff</color>
<color name="unlock_pattern_view_regular_color">@android:color/white</color>
<color name="unlock_pattern_view_error_color">@*android:color/system_error</color>
<color name="fingerprint_title_area_bg">?android:attr/colorAccent</color>
<color name="fingerprint_title_color">#ffffffff</color>
@@ -75,8 +72,6 @@
<color name="memory_avg_use">#ff384248</color>
<color name="zen_rule_name_warning">@*android:color/system_error</color>
<!-- Accent color that matches the settings launcher icon -->
<color name="icon_accent">#ffabffec</color>

32
res/values/styles.xml
View File

@@ -192,7 +192,7 @@
<item name="android:textSize">12sp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
<item name="android:textColor">@*android:color/system_error</item>
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="wifi_item_content">
@@ -330,7 +330,7 @@
<style name="TextAppearance.FingerprintErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@*android:color/system_error</item>
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="TextAppearance.SupportTitle"
@@ -354,7 +354,7 @@
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@*android:color/system_error</item>
<item name="android:textColor">?android:attr/colorError</item>
</style>
<style name="TextAppearance.Small.SwitchBar">
@@ -429,4 +429,30 @@
</style>
<style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
<style name="LockPatternStyle">
<item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/lock_pattern_view_success_color</item>
<item name="*android:errorColor">?android:attr/colorError</item>
</style>
<style name="LockPatternStyle.Dark">
<item name="*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
<item name="*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
</style>
<style name="LockPatternStyle.Dark.Work">
<item name="*android:regularColor">@*android:color/white</item>
</style>
<style name="LockPatternStyle.Unlock">
<item name="*android:regularColor">@color/unlock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/unlock_pattern_view_success_color</item>
</style>
<style name="LockPatternStyle.Setup">
<item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
<item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
</style>
</resources>

27
res/values/themes.xml
View File

@@ -40,9 +40,7 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_dark</item>
<item name="*android:successColor">@color/setup_lock_pattern_view_success_color_dark</item>
<item name="*android:errorColor">@color/setup_lock_pattern_view_error_color_dark</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="SetupWizardTheme.Light" parent="SuwThemeGlif.Light">
@@ -62,10 +60,7 @@
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
<item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
<item name="*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
@@ -152,10 +147,7 @@
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
<!-- LockPatternView colors -->
<item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/lock_pattern_view_success_color</item>
<item name="*android:errorColor">@color/lock_pattern_view_error_color</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
<style name="Theme.SubSettings" parent="Theme.Settings">
@@ -201,10 +193,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:background">@android:color/black</item>
<!-- LockPatternView colors -->
<item name="*android:regularColor">@color/unlock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/unlock_pattern_view_success_color</item>
<item name="*android:errorColor">@color/unlock_pattern_view_error_color</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Unlock</item>
</style>
<style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
@@ -240,15 +229,13 @@
<item name="confirmDeviceCredentialsSideMargin">32dp</item>
<item name="confirmDeviceCredentialsTopMargin">32dp</item>
<!-- LockPatternView colors -->
<item name="*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
<item name="*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
<item name="*android:errorColor">@color/lock_pattern_view_error_color</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark</item>
<item name="android:windowAnimationStyle">@style/ConfirmDeviceCredentialsAnimationStyle</item>
</style>
<style name="Theme.ConfirmDeviceCredentialsWork" parent="Theme.ConfirmDeviceCredentialsDark">
<item name="*android:regularColor">@*android:color/white</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark.Work</item>
<item name="android:colorAccent">@*android:color/white</item>
</style>

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);
}