From a360e1e70ff5bb40a950bfe6dd3250415ec99eda Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Mon, 17 Jul 2017 17:25:20 -0700 Subject: [PATCH] Renamed attribute with abbreviated name Renamed attribute as part of refactoring overlays. Bug: 63751714 Test: make Change-Id: Ia75fbf6c1dbcbd530d6b03a239b61b61719da8e0 --- .../res-keyguard/layout/keyguard_password_view.xml | 2 +- .../res-keyguard/layout/keyguard_pin_view.xml | 2 +- .../res-keyguard/layout/keyguard_presentation.xml | 2 +- .../res-keyguard/layout/keyguard_sim_pin_view.xml | 2 +- .../res-keyguard/layout/keyguard_sim_puk_view.xml | 2 +- .../res-keyguard/layout/keyguard_status_area.xml | 6 +++--- .../res-keyguard/layout/keyguard_status_view.xml | 4 ++-- packages/SystemUI/res-keyguard/values/styles.xml | 14 +++++++------- .../res/color/background_protect_secondary.xml | 2 +- .../SystemUI/res/color/background_protected.xml | 2 +- packages/SystemUI/res/color/pin_delete_color.xml | 2 +- packages/SystemUI/res/color/pin_divider_color.xml | 2 +- .../SystemUI/res/layout/keyguard_bottom_area.xml | 10 +++++----- .../SystemUI/res/layout/keyguard_status_bar.xml | 2 +- packages/SystemUI/res/layout/recents_empty.xml | 4 ++-- .../res/layout/recents_stack_action_button.xml | 2 +- .../res/layout/status_bar_no_notifications.xml | 2 +- .../layout/status_bar_notification_dismiss_all.xml | 2 +- packages/SystemUI/res/values/attrs.xml | 4 ++-- packages/SystemUI/res/values/styles.xml | 12 ++++++------ .../statusbar/phone/KeyguardStatusBarView.java | 2 +- .../systemui/statusbar/phone/TrustDrawable.java | 2 +- 22 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml index 26a179a435313..b821e7e76c60e 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml @@ -54,7 +54,7 @@ android:textStyle="normal" android:inputType="textPassword" android:textSize="16sp" - android:textColor="?attr/bgProtectTextColor" + android:textColor="?attr/wallpaperTextColor" android:textAppearance="?android:attr/textAppearanceMedium" android:imeOptions="flagForceAscii|actionDone" android:maxLength="500" diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml index 501d0a57148a3..3283e0411ec4d 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml @@ -54,7 +54,7 @@ android:layout_centerHorizontal="true" android:layout_marginRight="72dp" androidprv:scaledTextSize="@integer/scaled_password_text_size" - android:textColor="?attr/bgProtectTextColor" + android:textColor="?attr/wallpaperTextColor" android:contentDescription="@string/keyguard_accessibility_pin_area" /> @@ -34,7 +34,7 @@ @null 32sp @*android:string/config_headlineFontFamilyLight - ?attr/bgProtectTextColor + ?attr/wallpaperTextColor -16dp @@ -61,9 +61,9 @@ @@ -306,8 +306,8 @@ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index f7c2fc8633ab3..c1581c835a9ca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -333,7 +333,7 @@ public class KeyguardStatusBarView extends RelativeLayout } public void onOverlayChanged() { - @ColorInt int textColor = Utils.getColorAttr(mContext, R.attr.bgProtectTextColor); + @ColorInt int textColor = Utils.getColorAttr(mContext, R.attr.wallpaperTextColor); mCarrierLabel.setTextColor(textColor); mBatteryView.setFillColor(textColor); mIconManager.setTint(textColor); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java index e8a456e9bf60f..028da86dea340 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java @@ -83,7 +83,7 @@ public class TrustDrawable extends Drawable { mPaint = new Paint(); mPaint.setStyle(Paint.Style.STROKE); - mPaint.setColor(Utils.getColorAttr(context, R.attr.bgProtectTextColor)); + mPaint.setColor(Utils.getColorAttr(context, R.attr.wallpaperTextColor)); mPaint.setAntiAlias(true); mPaint.setStrokeWidth(mThickness); }