Merge "Add shadow to text on keyguard" into qt-dev (0a8fcb3a) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/values/styles.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,8 @@
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item>
		<item name="android:ellipsize">none</item>
		<item name="android:shadowColor">@color/keyguard_shadow_color</item>
		<item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
		</style>
		<style name="widget_title_bold">
		<item name="android:textStyle">bold</item>
		@@ -72,6 +74,8 @@
		<item name="android:paddingBottom">@dimen/widget_vertical_padding_clock</item>
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:ellipsize">none</item>
		<item name="android:shadowColor">@color/keyguard_shadow_color</item>
		<item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
		</style>
		<style name="widget_small_bold">
		<item name="android:textStyle">bold</item>
		@@ -79,6 +83,8 @@
		<item name="android:paddingBottom">@dimen/bottom_text_spacing_digital</item>
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:ellipsize">none</item>
		<item name="android:shadowColor">@color/keyguard_shadow_color</item>
		<item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
		</style>

		<style name="BouncerSecurityContainer">
		@@ -108,6 +114,8 @@
		<item name="android:ellipsize">end</item>
		<item name="android:maxLines">2</item>
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:shadowColor">@color/keyguard_shadow_color</item>
		<item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
		</style>

		<style name="TextAppearance.Keyguard.Secondary">
		@@ -121,6 +129,8 @@
		<item name="android:textSize">16sp</item>
		<item name="android:maxLines">1</item>
		<item name="android:textColor">?attr/wallpaperTextColor</item>
		<item name="android:shadowColor">@color/keyguard_shadow_color</item>
		<item name="android:shadowRadius">@dimen/keyguard_shadow_radius</item>
		</style>

		</resources>

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@

		<LinearLayout
		android:id="@+id/keyguard_indication_area"
		android:forceHasOverlappingRendering="false"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"

packages/SystemUI/res/values/colors.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,9 @@

		<color name="keyguard_affordance">#ffffffff</color>

		<!-- Shadows under the clock, date and other keyguard text fields -->
		<color name="keyguard_shadow_color">#B2000000</color>

		<!-- The color of the legacy notification background -->
		<color name="notification_legacy_background_color">#ff1a1a1a</color>

packages/SystemUI/res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,9 @@
		<!-- The padding on the bottom of the notifications on the keyguard -->
		<dimen name="keyguard_indication_bottom_padding">12sp</dimen>

		<!-- Shadows under the clock, date and other keyguard text fields -->
		<dimen name="keyguard_shadow_radius">5</dimen>

		<!-- Minimum layouted height of a notification in the statusbar-->
		<dimen name="min_notification_layout_height">48dp</dimen>

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -319,11 +319,6 @@ public class KeyguardStatusView extends GridLayout implements
		refreshFormat();
		}

		@Override
		public boolean hasOverlappingRendering() {
		return false;
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("KeyguardStatusView:");
		pw.println(" mOwnerInfo: " + (mOwnerInfo == null