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

Merge "Renamed attribute with abbreviated name" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-18 18:23:55 +00:00
committed by Android (Google) Code Review
parent 560acb043d a360e1e70f
commit df83b8cfcf
22 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml
View File

@@ -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"

2
packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
View File

@@ -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"
/>
<ImageButton

2
packages/SystemUI/res-keyguard/layout/keyguard_presentation.xml
View File

@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:textColor="?attr/bgProtectTextColor"
android:textColor="?attr/wallpaperTextColor"
android:singleLine="true"
style="@style/widget_big_thin"
android:format12Hour="@string/keyguard_widget_12_hours_format"

2
packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml
View File

@@ -67,7 +67,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_sim_pin_area"
/>
<ImageButton

2
packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml
View File

@@ -68,7 +68,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_sim_puk_area"
/>
<ImageButton

6
packages/SystemUI/res-keyguard/layout/keyguard_status_area.xml
View File

@@ -29,7 +29,7 @@
android:id="@+id/date_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/bgProtectTextColor"
android:textColor="?attr/wallpaperTextColor"
style="@style/widget_label"
android:letterSpacing="0.15"
android:gravity="center"
@@ -39,9 +39,9 @@
android:layout_height="wrap_content"
android:drawablePadding="6dp"
android:drawableStart="@drawable/ic_access_alarms_big"
android:drawableTint="?attr/bgProtectSecondaryTextColor"
android:drawableTint="?attr/wallpaperTextColorSecondary"
android:drawableTintMode="src_in"
android:textColor="?attr/bgProtectSecondaryTextColor"
android:textColor="?attr/wallpaperTextColorSecondary"
android:letterSpacing="0.15"
style="@style/widget_label"
android:layout_marginStart="6dp"

4
packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml
View File

@@ -44,7 +44,7 @@
android:layout_gravity="center_horizontal"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:textColor="?attr/bgProtectTextColor"
android:textColor="?attr/wallpaperTextColor"
android:singleLine="true"
style="@style/widget_big_thin"
android:format12Hour="@string/keyguard_widget_12_hours_format"
@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/date_owner_info_margin"
android:layout_centerHorizontal="true"
android:textColor="?attr/bgProtectSecondaryTextColor"
android:textColor="?attr/wallpaperTextColorSecondary"
android:textSize="@dimen/widget_label_font_size"
android:letterSpacing="0.05"
android:ellipsize="marquee"

14
packages/SystemUI/res-keyguard/values/styles.xml
View File

@@ -20,11 +20,11 @@
<resources>
<!-- Keyguard PIN pad styles -->
<style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">
<item name="android:textColor">?attr/bgProtectSecondaryTextColor</item>
<item name="android:textColor">?attr/wallpaperTextColorSecondary</item>
<item name="android:textSize">@dimen/kg_status_line_font_size</item>
</style>
<style name="Keyguard.TextView.EmergencyButton" parent="@android:style/DeviceDefault.ButtonBar">
<item name="android:textColor">?attr/bgProtectSecondaryTextColor</item>
<item name="android:textColor">?attr/wallpaperTextColorSecondary</item>
<item name="android:textSize">@dimen/kg_status_line_font_size</item>
<item name="android:background">@null</item>
</style>
@@ -34,7 +34,7 @@
<item name="android:background">@null</item>
<item name="android:textSize">32sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
<item name="android:textColor">?attr/bgProtectTextColor</item>
<item name="android:textColor">?attr/wallpaperTextColor</item>
<item name="android:paddingBottom">-16dp</item>
</style>
<style name="Keyguard.ImageButton.NumPadEnter" parent="@android:style/Widget.ImageButton">
@@ -43,7 +43,7 @@
<style name="Widget.TextView.NumPadKey.Klondike" parent="Widget.TextView.NumPadKey">
<item name="android:textSize">12sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">?attr/bgProtectSecondaryTextColor</item>
<item name="android:textColor">?attr/wallpaperTextColorSecondary</item>
<item name="android:paddingBottom">0dp</item>
</style>
@@ -61,9 +61,9 @@
</style>
<style name="PasswordTheme" parent="systemui_theme">
<item name="android:textColor">?attr/bgProtectTextColor</item>
<item name="android:colorControlNormal">?attr/bgProtectTextColor</item>
<item name="android:colorControlActivated">?attr/bgProtectTextColor</item>
<item name="android:textColor">?attr/wallpaperTextColor</item>
<item name="android:colorControlNormal">?attr/wallpaperTextColor</item>
<item name="android:colorControlActivated">?attr/wallpaperTextColor</item>
</style>
<style name="keyguard_presentation_theme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">

2
packages/SystemUI/res/color/background_protect_secondary.xml
View File

@@ -16,5 +16,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/bgProtectSecondaryTextColor" />
<item android:color="?attr/wallpaperTextColorSecondary" />
</selector>

2
packages/SystemUI/res/color/background_protected.xml
View File

@@ -16,5 +16,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/bgProtectTextColor" />
<item android:color="?attr/wallpaperTextColor" />
</selector>

2
packages/SystemUI/res/color/pin_delete_color.xml
View File

@@ -15,5 +15,5 @@
~ limitations under the License
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.61" android:color="?attr/bgProtectTextColor" />
<item android:alpha="0.61" android:color="?attr/wallpaperTextColor" />
</selector>

2
packages/SystemUI/res/color/pin_divider_color.xml
View File

@@ -15,5 +15,5 @@
~ limitations under the License
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.45" android:color="?attr/bgProtectSecondaryTextColor" />
<item android:alpha="0.45" android:color="?attr/wallpaperTextColorSecondary" />
</selector>

10
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="italic"
android:textColor="?attr/bgProtectSecondaryTextColor"
android:textColor="?attr/wallpaperTextColorSecondary"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone" />
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="italic"
android:textColor="?attr/bgProtectSecondaryTextColor"
android:textColor="?attr/wallpaperTextColorSecondary"
android:textAppearance="?android:attr/textAppearanceSmall"
android:accessibilityLiveRegion="polite" />
@@ -69,7 +69,7 @@
android:src="@drawable/ic_camera_alt_24dp"
android:scaleType="center"
android:contentDescription="@string/accessibility_camera_button"
android:tint="?attr/bgProtectTextColor" />
android:tint="?attr/wallpaperTextColor" />
<com.android.systemui.statusbar.KeyguardAffordanceView
android:id="@+id/left_button"
@@ -79,7 +79,7 @@
android:src="@drawable/ic_phone_24dp"
android:scaleType="center"
android:contentDescription="@string/accessibility_phone_button"
android:tint="?attr/bgProtectTextColor" />
android:tint="?attr/wallpaperTextColor" />
<com.android.systemui.statusbar.phone.LockIcon
android:id="@+id/lock_icon"
@@ -89,7 +89,7 @@
android:src="@drawable/ic_lock_24dp"
android:contentDescription="@string/accessibility_unlock_button"
android:scaleType="center"
android:tint="?attr/bgProtectTextColor" />
android:tint="?attr/wallpaperTextColor" />
<FrameLayout
android:id="@+id/overlay_container"

2
packages/SystemUI/res/layout/keyguard_status_bar.xml
View File

@@ -63,7 +63,7 @@
android:gravity="center_vertical"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?attr/bgProtectSecondaryTextColor"
android:textColor="?attr/wallpaperTextColorSecondary"
android:singleLine="true" />
</com.android.systemui.statusbar.phone.KeyguardStatusBarView>

4
packages/SystemUI/res/layout/recents_empty.xml
View File

@@ -23,8 +23,8 @@
android:drawableTop="@drawable/recents_empty"
android:drawablePadding="25dp"
android:textSize="16sp"
android:drawableTint="?attr/bgProtectTextColor"
android:textColor="?attr/bgProtectTextColor"
android:drawableTint="?attr/wallpaperTextColor"
android:textColor="?attr/wallpaperTextColor"
android:text="@string/recents_empty_message"
android:fontFamily="sans-serif"
android:visibility="gone" />

2
packages/SystemUI/res/layout/recents_stack_action_button.xml
View File

@@ -24,7 +24,7 @@
android:paddingBottom="12dp"
android:text="@string/recents_stack_action_button_label"
android:textSize="14sp"
android:textColor="?attr/bgProtectTextColor"
android:textColor="?attr/wallpaperTextColor"
android:textAllCaps="true"
android:shadowColor="#99000000"
android:shadowDx="0"

2
packages/SystemUI/res/layout/status_bar_no_notifications.xml
View File

@@ -27,7 +27,7 @@
android:layout_height="64dp"
android:paddingTop="28dp"
android:gravity="top|center_horizontal"
android:textColor="?attr/bgProtectTextColor"
android:textColor="?attr/wallpaperTextColor"
android:textSize="16sp"
android:text="@string/empty_shade_text"/>
</com.android.systemui.statusbar.EmptyShadeView>

2
packages/SystemUI/res/layout/status_bar_notification_dismiss_all.xml
View File

@@ -30,6 +30,6 @@
android:focusable="true"
android:contentDescription="@string/accessibility_clear_all"
android:text="@string/clear_all_notifications_text"
android:textColor="?attr/bgProtectTextColor"
android:textColor="?attr/wallpaperTextColor"
android:textAllCaps="true"/>
</com.android.systemui.statusbar.DismissView>

4
packages/SystemUI/res/values/attrs.xml
View File

@@ -127,7 +127,7 @@
<attr name="lightIconTheme" format="reference" />
<attr name="darkIconTheme" format="reference" />
<attr name="bgProtectTextColor" format="color" />
<attr name="bgProtectSecondaryTextColor" format="color" />
<attr name="wallpaperTextColor" format="color" />
<attr name="wallpaperTextColorSecondary" format="color" />
</resources>

12
packages/SystemUI/res/values/styles.xml
View File

@@ -41,8 +41,8 @@
<item name="android:windowShowWallpaper">true</item>
<item name="android:windowDisablePreview">true</item>
<item name="clearAllStyle">@style/ClearAllButtonDefaultMargins</item>
<item name="bgProtectTextColor">?android:attr/textColorPrimaryInverse</item>
<item name="bgProtectSecondaryTextColor">?android:attr/textColorSecondaryInverse</item>
<item name="wallpaperTextColor">?android:attr/textColorPrimaryInverse</item>
<item name="wallpaperTextColorSecondary">?android:attr/textColorSecondaryInverse</item>
</style>
<style name="ClearAllButtonDefaultMargins">
@@ -55,8 +55,8 @@
<!-- Performance optimized Recents theme (no wallpaper) -->
<style name="RecentsTheme.NoWallpaper">
<item name="android:windowBackground">@android:color/black</item>
<item name="bgProtectTextColor">@android:color/white</item>
<item name="bgProtectSecondaryTextColor">@android:color/white</item>
<item name="wallpaperTextColor">@android:color/white</item>
<item name="wallpaperTextColorSecondary">@android:color/white</item>
</style>
<!-- Theme used for the activity that shows when the system forced an app to be resizable -->
@@ -306,8 +306,8 @@
<style name="systemui_theme" parent="systemui_base">
<item name="lightIconTheme">@style/DualToneLightTheme</item>
<item name="darkIconTheme">@style/DualToneDarkTheme</item>
<item name="bgProtectTextColor">?android:attr/textColorPrimaryInverse</item>
<item name="bgProtectSecondaryTextColor">?android:attr/textColorSecondaryInverse</item>
<item name="wallpaperTextColor">?android:attr/textColorPrimaryInverse</item>
<item name="wallpaperTextColorSecondary">?android:attr/textColorSecondaryInverse</item>
<item name="android:colorControlHighlight">?android:attr/textColorSecondaryInverse</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
View File

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

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/TrustDrawable.java
View File

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