summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout-sw600dp/nfc_payment_how_it_works.xml12
-rw-r--r--res/layout/app_header.xml2
-rw-r--r--res/layout/custom_screencolor.xml12
-rwxr-xr-xres/layout/expanded_item.xml2
-rw-r--r--res/layout/filter_spinner_item.xml2
-rw-r--r--res/layout/multi_sim_dialog.xml2
-rw-r--r--res/layout/network_reset_disallowed_screen.xml4
-rw-r--r--res/layout/nfc_payment_how_it_works.xml12
-rw-r--r--res/layout/permission_settings.xml2
-rw-r--r--res/layout/privacy_guard_manager.xml4
-rw-r--r--res/layout/screen_color_item.xml2
-rw-r--r--res/layout/settings_color_picker_item.xml2
-rwxr-xr-xres/layout/single_button_panel.xml2
-rw-r--r--res/layout/storage_internal_format.xml2
-rw-r--r--res/layout/storage_summary.xml2
-rw-r--r--res/layout/storage_wizard_navigation.xml2
-rw-r--r--res/values/cm_colors.xml12
-rw-r--r--src/com/android/settings/deviceinfo/StorageSummaryPreference.java4
18 files changed, 48 insertions, 34 deletions
diff --git a/res/layout-sw600dp/nfc_payment_how_it_works.xml b/res/layout-sw600dp/nfc_payment_how_it_works.xml
index 3bee16040..5d71e1a25 100644
--- a/res/layout-sw600dp/nfc_payment_how_it_works.xml
+++ b/res/layout-sw600dp/nfc_payment_how_it_works.xml
@@ -3,7 +3,7 @@
android:id="@+id/trusted_devices_prompt_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#FF80CBC4" >
+ android:background="@color/nfc_how_it_works_main_background" >
<RelativeLayout
android:layout_width="match_parent"
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="336dp"
- android:background="#FFB2DFDB" >
+ android:background="@color/nfc_how_it_works_background" >
</LinearLayout>
<LinearLayout
@@ -37,7 +37,7 @@
android:layout_width="420dp"
android:layout_height="wrap_content"
android:text="@string/nfc_how_it_works_title"
- android:textColor="#FF263238"
+ android:textColor="@color/nfc_how_it_works_title_text_color"
android:textSize="24sp" />
<TextView
@@ -47,14 +47,14 @@
android:paddingTop="10dp"
android:paddingBottom="18dp"
android:text="@string/nfc_how_it_works_content"
- android:textColor="#FF263238"
+ android:textColor="@color/nfc_how_it_works_content_text_color"
android:textSize="20sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_alignParentBottom="true"
- android:background="#FFB2DFDB" >
+ android:background="@color/nfc_how_it_works_footer_background" >
<Button
android:id="@+id/nfc_how_it_works_button"
android:background="?android:attr/selectableItemBackground"
@@ -64,7 +64,7 @@
android:layout_marginRight="20dp"
android:text="@string/nfc_how_it_works_got_it"
android:textSize="14sp"
- android:textColor="#263238"
+ android:textColor="@color/nfc_how_it_works_got_it_text_color"
style="?android:attr/borderlessButtonStyle" />
</RelativeLayout>
</RelativeLayout>
diff --git a/res/layout/app_header.xml b/res/layout/app_header.xml
index ffc682963..bad94c029 100644
--- a/res/layout/app_header.xml
+++ b/res/layout/app_header.xml
@@ -36,7 +36,7 @@
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
android:textAppearance="@style/TextAppearance.Switch"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:textAlignment="viewStart" />
<ImageView
diff --git a/res/layout/custom_screencolor.xml b/res/layout/custom_screencolor.xml
index 7fc7cfd3b..7cc34a9d3 100644
--- a/res/layout/custom_screencolor.xml
+++ b/res/layout/custom_screencolor.xml
@@ -46,7 +46,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:text="@string/screencolor_cancel"
android:background="@drawable/screencolor_btn"/>
<Button
@@ -55,7 +55,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:text="@string/screencolor_save"
android:background="@drawable/screencolor_btn"/>
</LinearLayout>
@@ -126,7 +126,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:paddingLeft="20dip"
android:paddingTop="10dip"
android:layout_width="match_parent"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:text="@string/hue_str"/>
<RelativeLayout
@@ -168,7 +168,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:paddingLeft="20dip"
android:paddingTop="10dip"
android:layout_width="fill_parent"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:text="@string/saturation_str"/>
<RelativeLayout
android:layout_width="wrap_content"
@@ -207,7 +207,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:paddingLeft="20dip"
android:paddingTop="10dip"
android:layout_width="fill_parent"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:text="@string/contrast_str"/>
<RelativeLayout
android:layout_width="wrap_content"
@@ -246,7 +246,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:paddingLeft="20dip"
android:paddingTop="10dip"
android:layout_width="fill_parent"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:text="@string/intensity_str"/>
<RelativeLayout
android:layout_width="wrap_content"
diff --git a/res/layout/expanded_item.xml b/res/layout/expanded_item.xml
index fbe34f78f..8098662d2 100755
--- a/res/layout/expanded_item.xml
+++ b/res/layout/expanded_item.xml
@@ -49,7 +49,7 @@
android:layout_marginTop="2dip"
android:singleLine="true"
android:ellipsize="marquee"
- android:textColor="@android:color/black"
+ android:textColor="@color/text_color_black"
android:textAppearance="@style/TextAppearance.Medium"
android:textAlignment="viewStart" />
diff --git a/res/layout/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml
index e83dd8071..6b7bdb85f 100644
--- a/res/layout/filter_spinner_item.xml
+++ b/res/layout/filter_spinner_item.xml
@@ -23,5 +23,5 @@
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:textAppearance="@style/TextAppearance.Switch"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:textAlignment="inherit"/>
diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml
index 95c601eff..02643accd 100644
--- a/res/layout/multi_sim_dialog.xml
+++ b/res/layout/multi_sim_dialog.xml
@@ -44,7 +44,7 @@
android:hint="@string/sim_name_hint"
android:inputType="textNoSuggestions"
android:maxLength="@integer/sim_name_length"
- android:textColor="@android:color/black"
+ android:textColor="@color/text_color_black"
style="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/layout/network_reset_disallowed_screen.xml b/res/layout/network_reset_disallowed_screen.xml
index 04f6fc2b4..e72708bf2 100644
--- a/res/layout/network_reset_disallowed_screen.xml
+++ b/res/layout/network_reset_disallowed_screen.xml
@@ -26,8 +26,8 @@
android:layout_height="match_parent"
android:drawSelectorOnTop="false"
android:scrollbarStyle="insideOverlay"
- android:background="@android:color/white"
- android:cacheColorHint="@android:color/white"
+ android:background="@color/background_color_white"
+ android:cacheColorHint="@color/background_color_white"
android:fadingEdgeLength="16dip" />
<TextView android:id="@android:id/empty"
diff --git a/res/layout/nfc_payment_how_it_works.xml b/res/layout/nfc_payment_how_it_works.xml
index 565a16b7d..a870e5b26 100644
--- a/res/layout/nfc_payment_how_it_works.xml
+++ b/res/layout/nfc_payment_how_it_works.xml
@@ -3,7 +3,7 @@
android:id="@+id/trusted_devices_prompt_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#FF80CBC4" >
+ android:background="@color/nfc_how_it_works_main_background" >
<RelativeLayout
android:layout_width="match_parent"
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="200dp"
- android:background="#FFB2DFDB" >
+ android:background="@color/nfc_how_it_works_background" >
</LinearLayout>
<LinearLayout
@@ -38,7 +38,7 @@
android:text="@string/nfc_how_it_works_title"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:textColor="#FF263238"
+ android:textColor="@color/nfc_how_it_works_title_text_color"
android:textSize="24sp" />
<TextView
@@ -50,14 +50,14 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/nfc_how_it_works_content"
- android:textColor="#FF263238"
+ android:textColor="@color/nfc_how_it_works_content_text_color"
android:textSize="16sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_alignParentBottom="true"
- android:background="#FFB2DFDB" >
+ android:background="@color/nfc_how_it_works_footer_background" >
<Button
android:id="@+id/nfc_how_it_works_button"
android:background="?android:attr/selectableItemBackground"
@@ -67,7 +67,7 @@
android:layout_marginRight="20dp"
android:text="@string/nfc_how_it_works_got_it"
android:textSize="14sp"
- android:textColor="#263238"
+ android:textColor="@color/nfc_how_it_works_got_it_text_color"
style="?android:attr/borderlessButtonStyle" />
</RelativeLayout>
</RelativeLayout>
diff --git a/res/layout/permission_settings.xml b/res/layout/permission_settings.xml
index f08b9d64f..2067c02f1 100644
--- a/res/layout/permission_settings.xml
+++ b/res/layout/permission_settings.xml
@@ -43,7 +43,7 @@
android:text="@string/permissions_label" />
<TextView android:id="@+id/security_settings_billing_desc"
android:text="@string/security_settings_billing_desc"
- android:textColor="#ffffb060"
+ android:textColor="@color/security_settings_billing_desc_text_color"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingTop="6dip"
android:paddingBottom="6dip"
diff --git a/res/layout/privacy_guard_manager.xml b/res/layout/privacy_guard_manager.xml
index e119ecac2..cfdf27d51 100644
--- a/res/layout/privacy_guard_manager.xml
+++ b/res/layout/privacy_guard_manager.xml
@@ -25,7 +25,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@android:color/darker_gray"/>
+ android:background="@color/background_color_darker_gray"/>
<TextView
android:id="@+id/error"
android:layout_width="match_parent"
@@ -33,7 +33,7 @@
android:layout_marginTop="20dip"
android:layout_gravity="center"
android:gravity="center_horizontal"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone" />
<FrameLayout
diff --git a/res/layout/screen_color_item.xml b/res/layout/screen_color_item.xml
index b55af0661..2a4772fe4 100644
--- a/res/layout/screen_color_item.xml
+++ b/res/layout/screen_color_item.xml
@@ -55,7 +55,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAlignment="viewStart"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:labelFor="@android:id/button2" />
<RadioButton
diff --git a/res/layout/settings_color_picker_item.xml b/res/layout/settings_color_picker_item.xml
index c171950d1..d8fc8c1f9 100644
--- a/res/layout/settings_color_picker_item.xml
+++ b/res/layout/settings_color_picker_item.xml
@@ -41,7 +41,7 @@
android:paddingBottom="8dp"
android:paddingRight="8dp"
android:paddingLeft="8dp"
- android:textColor="@android:color/black"
+ android:textColor="@color/text_color_black"
style="?android:attr/textAppearanceMedium" />
</LinearLayout> \ No newline at end of file
diff --git a/res/layout/single_button_panel.xml b/res/layout/single_button_panel.xml
index 348f7ce91..324a2f6ba 100755
--- a/res/layout/single_button_panel.xml
+++ b/res/layout/single_button_panel.xml
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:backgroundTint="?android:attr/colorAccent"
- android:textColor="@android:color/white" />
+ android:textColor="@color/text_color_white" />
<Space
android:layout_width="0dip"
android:layout_height="wrap_content"
diff --git a/res/layout/storage_internal_format.xml b/res/layout/storage_internal_format.xml
index 8aec28f9a..c90ed285f 100644
--- a/res/layout/storage_internal_format.xml
+++ b/res/layout/storage_internal_format.xml
@@ -46,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/storage_menu_format"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:backgroundTint="@color/storage_wizard_button_red" />
</FrameLayout>
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index 35201e165..0a611107e 100644
--- a/res/layout/storage_summary.xml
+++ b/res/layout/storage_summary.xml
@@ -33,7 +33,7 @@
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="#ff607d8b"
+ android:textColor="@color/storage_summary_text_color"
android:textSize="36sp"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
diff --git a/res/layout/storage_wizard_navigation.xml b/res/layout/storage_wizard_navigation.xml
index 94f9bafef..191d4f220 100644
--- a/res/layout/storage_wizard_navigation.xml
+++ b/res/layout/storage_wizard_navigation.xml
@@ -46,7 +46,7 @@
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:text="@string/wizard_next"
- android:textColor="@android:color/white"
+ android:textColor="@color/text_color_white"
android:backgroundTint="@color/storage_wizard_button" />
</LinearLayout>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index e4b5ee286..e4ba40a84 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -64,4 +64,16 @@ limitations under the License.
<drawable name="ic_menu_add_word">@drawable/ic_menu_add_dark</drawable>
<color name="screencolor_background">#50000000</color>
<drawable name="transparent_background">#00000000</drawable>
+ <!-- NFC hard colors -->
+ <color name="nfc_how_it_works_main_background">#FF80CBC4</color>
+ <color name="nfc_how_it_works_background">#FFB2DFDB</color>
+ <color name="nfc_how_it_works_title_text_color">#FF263238</color>
+ <color name="nfc_how_it_works_content_text_color">#FF263238</color>
+ <color name="nfc_how_it_works_footer_background">#FFB2DFDB</color>
+ <color name="nfc_how_it_works_got_it_text_color">#263238</color>
+ <!-- Permission Settings Hard colors-->
+ <color name="security_settings_billing_desc_text_color">#ffffb060</color>
+ <!-- Storage Summary Hard colors-->
+ <color name="storage_summary_text_color">#ff607d8b</color>
+ <color name="storage_summary_used_text_color">#8a000000</color>
</resources>
diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
index 2641cb618..919e42d3b 100644
--- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import android.content.Context;
+import android.content.res.Resources;
import android.graphics.Color;
import android.preference.Preference;
import android.view.View;
@@ -41,6 +42,7 @@ public class StorageSummaryPreference extends Preference {
@Override
protected void onBindView(View view) {
+ Resources res = getContext().getResources();
final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
if (mPercent != -1) {
progress.setVisibility(View.VISIBLE);
@@ -50,7 +52,7 @@ public class StorageSummaryPreference extends Preference {
}
final TextView summary = (TextView) view.findViewById(android.R.id.summary);
- summary.setTextColor(Color.parseColor("#8a000000"));
+ summary.setTextColor(res.getColor(R.color.storage_summary_used_text_color));
super.onBindView(view);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-21 07:26:48 +0000