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

Merge "Visual refinements for lockscreen." into lmp-preview-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2014-05-26 14:23:38 +00:00
committed by Android (Google) Code Review
parent 2a87343a8e cc12a9daf6
commit 37e6562421
10 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Keyguard/res/layout/keyguard_status_view.xml
View File

@@ -39,13 +39,12 @@
android:id="@+id/clock_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:layout_gravity="center_horizontal"
android:textColor="@color/clock_white"
android:singleLine="true"
style="@style/widget_big_thin"
android:format12Hour="@string/keyguard_widget_12_hours_format"
android:format24Hour="@string/keyguard_widget_24_hours_format"
android:baselineAligned="true"
android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />
<include layout="@layout/keyguard_status_area" />

1
packages/Keyguard/res/values-sw600dp-land/dimens.xml
View File

@@ -26,5 +26,4 @@
<!-- Overload default clock widget parameters -->
<dimen name="widget_big_font_size">88dp</dimen>
<dimen name="bottom_text_spacing_digital">-24dp</dimen>
</resources>

2
packages/Keyguard/res/values-sw600dp/dimens.xml
View File

@@ -65,7 +65,7 @@
<!-- Overload default clock widget parameters -->
<dimen name="widget_big_font_size">96dp</dimen>
<dimen name="widget_label_font_size">16sp</dimen>
<dimen name="bottom_text_spacing_digital">-24dp</dimen>
<dimen name="bottom_text_spacing_digital">-8dp</dimen>
<!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.
Should be 0 on devices with plenty of room (e.g. tablets) -->

2
packages/Keyguard/res/values/dimens.xml
View File

@@ -155,7 +155,7 @@
<dimen name="eca_overlap">-10dip</dimen>
<!-- Default clock parameters -->
<dimen name="bottom_text_spacing_digital">-18dp</dimen>
<dimen name="bottom_text_spacing_digital">-6dp</dimen>
<dimen name="label_font_size">14dp</dimen>
<dimen name="widget_label_font_size">14sp</dimen>
<dimen name="widget_big_font_size">68dp</dimen>

4
packages/Keyguard/res/values/strings.xml
View File

@@ -97,9 +97,9 @@
<string name="keyguard_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string>
<!-- Time format strings for fall-back clock widget -->
<string name="keyguard_widget_12_hours_format" translatable="false">h&#58;mm</string>
<string name="keyguard_widget_12_hours_format" translatable="false">h\uee01mm</string>
<!-- Time format strings for fall-back clock widget -->
<string name="keyguard_widget_24_hours_format" translatable="false">kk&#58;mm</string>
<string name="keyguard_widget_24_hours_format" translatable="false">kk\uee01mm</string>
<!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d of %3$d.</string>

2
packages/Keyguard/res/values/styles.xml
View File

@@ -59,8 +59,6 @@
<!-- Built-in clock widget stuff -->
<style name="widget_label">
<item name="android:textStyle">bold</item>
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:textSize">@dimen/widget_label_font_size</item>
</style>
<style name="big_thin">

8
packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -95,6 +95,10 @@ public class KeyguardStatusView extends GridLayout {
final boolean screenOn = KeyguardUpdateMonitor.getInstance(mContext).isScreenOn();
setEnableMarquee(screenOn);
refresh();
// Disable elegant text height because our fancy colon makes the ymin value huge for no
// reason.
mClockView.setElegantTextHeight(false);
}
protected void refresh() {
@@ -164,6 +168,10 @@ public class KeyguardStatusView extends GridLayout {
clockView24 = DateFormat.getBestDateTimePattern(locale, clockView24Skel);
// Use fancy colon.
clockView24 = clockView24.replace(':', '\uee01');
clockView12 = clockView12.replace(':', '\uee01');
cacheKey = key;
}
}

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

@@ -53,7 +53,8 @@
android:layout_marginBottom="100dp"
android:layout_gravity="bottom|center_horizontal"
android:textStyle="italic"
android:textAppearance="?android:attr/textAppearanceMedium"/>
android:textColor="#ffffff"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<ImageView
android:id="@+id/lock_icon"

20
packages/SystemUI/res/layout/status_bar_expanded_header.xml
View File

@@ -65,15 +65,6 @@
/>
</RelativeLayout>
<com.android.keyguard.CarrierText
android:id="@+id/keyguard_carrier_text"
android:layout_width="wrap_content"
android:layout_height="@dimen/status_bar_header_height_keyguard"
android:layout_marginLeft="8dp"
android:gravity="center_vertical"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium" />
<com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"
android:layout_width="40dp"
android:layout_height="@dimen/status_bar_header_height"
@@ -98,6 +89,17 @@
android:layout_marginEnd="4dp"
/>
<com.android.keyguard.CarrierText
android:id="@+id/keyguard_carrier_text"
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_header_height_keyguard"
android:layout_marginLeft="8dp"
android:layout_toStartOf="@id/system_icons_container"
android:gravity="center_vertical"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#ffffff" />
<include
layout="@layout/quick_settings_brightness_dialog"
android:id="@+id/brightness_container"

4
packages/SystemUI/res/values-sw600dp/dimens.xml
View File

@@ -57,6 +57,6 @@
<!-- The margin between the clock and the notifications on Keyguard. See
keyguard_clock_height_fraction_* for the difference between min and max.-->
<dimen name="keyguard_clock_notifications_margin_min">32dp</dimen>
<dimen name="keyguard_clock_notifications_margin_max">32dp</dimen>
<dimen name="keyguard_clock_notifications_margin_min">36dp</dimen>
<dimen name="keyguard_clock_notifications_margin_max">36dp</dimen>
</resources>