diff options
40 files changed, 479 insertions, 402 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 0c0205ca5837..97bbe5218b70 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -103,7 +103,8 @@ public class LockPatternView extends View { private boolean mTactileFeedbackEnabled = true; private boolean mPatternInProgress = false; - private float mDiameterFactor = 0.5f; + private float mDiameterFactor = 0.10f; // TODO: move to attrs + private final int mStrokeAlpha = 128; private float mHitFactor = 0.6f; private float mSquareWidth; @@ -133,6 +134,7 @@ public class LockPatternView extends View { private final Matrix mArrowMatrix = new Matrix(); private final Matrix mCircleMatrix = new Matrix(); + /** * Represents a cell in the 3 X 3 matrix of the unlock pattern view. */ @@ -267,17 +269,17 @@ public class LockPatternView extends View { mPathPaint.setAntiAlias(true); mPathPaint.setDither(true); mPathPaint.setColor(Color.WHITE); // TODO this should be from the style - mPathPaint.setAlpha(128); + mPathPaint.setAlpha(mStrokeAlpha); mPathPaint.setStyle(Paint.Style.STROKE); mPathPaint.setStrokeJoin(Paint.Join.ROUND); mPathPaint.setStrokeCap(Paint.Cap.ROUND); // lot's of bitmaps! - mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default); - mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched); - mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default); - mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green); - mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red); + mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default_holo); + mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched_holo); + mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default_holo); + mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green_holo); + mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red_holo); mBitmapArrowGreenUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_green_up); mBitmapArrowRedUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_red_up); @@ -889,41 +891,6 @@ public class LockPatternView extends View { final Path currentPath = mCurrentPath; currentPath.rewind(); - // TODO: the path should be created and cached every time we hit-detect a cell - // only the last segment of the path should be computed here - // draw the path of the pattern (unless the user is in progress, and - // we are in stealth mode) - final boolean drawPath = (!mInStealthMode || mPatternDisplayMode == DisplayMode.Wrong); - if (drawPath) { - boolean anyCircles = false; - for (int i = 0; i < count; i++) { - Cell cell = pattern.get(i); - - // only draw the part of the pattern stored in - // the lookup table (this is only different in the case - // of animation). - if (!drawLookup[cell.row][cell.column]) { - break; - } - anyCircles = true; - - float centerX = getCenterXForColumn(cell.column); - float centerY = getCenterYForRow(cell.row); - if (i == 0) { - currentPath.moveTo(centerX, centerY); - } else { - currentPath.lineTo(centerX, centerY); - } - } - - // add last in progress section - if ((mPatternInProgress || mPatternDisplayMode == DisplayMode.Animate) - && anyCircles) { - currentPath.lineTo(mInProgressX, mInProgressY); - } - canvas.drawPath(currentPath, mPathPaint); - } - // draw the circles final int paddingTop = mPaddingTop; final int paddingLeft = mPaddingLeft; @@ -937,6 +904,12 @@ public class LockPatternView extends View { } } + // TODO: the path should be created and cached every time we hit-detect a cell + // only the last segment of the path should be computed here + // draw the path of the pattern (unless the user is in progress, and + // we are in stealth mode) + final boolean drawPath = (!mInStealthMode || mPatternDisplayMode == DisplayMode.Wrong); + // draw the arrows associated with the path (unless the user is in progress, and // we are in stealth mode) boolean oldFlag = (mPaint.getFlags() & Paint.FILTER_BITMAP_FLAG) != 0; @@ -959,6 +932,37 @@ public class LockPatternView extends View { drawArrow(canvas, leftX, topY, cell, next); } } + + if (drawPath) { + boolean anyCircles = false; + for (int i = 0; i < count; i++) { + Cell cell = pattern.get(i); + + // only draw the part of the pattern stored in + // the lookup table (this is only different in the case + // of animation). + if (!drawLookup[cell.row][cell.column]) { + break; + } + anyCircles = true; + + float centerX = getCenterXForColumn(cell.column); + float centerY = getCenterYForRow(cell.row); + if (i == 0) { + currentPath.moveTo(centerX, centerY); + } else { + currentPath.lineTo(centerX, centerY); + } + } + + // add last in progress section + if ((mPatternInProgress || mPatternDisplayMode == DisplayMode.Animate) + && anyCircles) { + currentPath.lineTo(mInProgressX, mInProgressY); + } + canvas.drawPath(currentPath, mPathPaint); + } + mPaint.setFilterBitmap(oldFlag); // restore default flag } diff --git a/core/res/res/drawable-hdpi/btn_code_lock_default_holo.png b/core/res/res/drawable-hdpi/btn_code_lock_default_holo.png Binary files differindex 94d27cf3df3e..94098902e928 100644 --- a/core/res/res/drawable-hdpi/btn_code_lock_default_holo.png +++ b/core/res/res/drawable-hdpi/btn_code_lock_default_holo.png diff --git a/core/res/res/drawable-hdpi/btn_code_lock_touched_holo.png b/core/res/res/drawable-hdpi/btn_code_lock_touched_holo.png Binary files differindex 94d27cf3df3e..55acc9ae968d 100644 --- a/core/res/res/drawable-hdpi/btn_code_lock_touched_holo.png +++ b/core/res/res/drawable-hdpi/btn_code_lock_touched_holo.png diff --git a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png b/core/res/res/drawable-large-mdpi/btn_code_lock_default_holo.png Binary files differindex 45cc20dd6ddf..45cc20dd6ddf 100644 --- a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png +++ b/core/res/res/drawable-large-mdpi/btn_code_lock_default_holo.png diff --git a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png b/core/res/res/drawable-large-mdpi/btn_code_lock_touched_holo.png Binary files differindex 45cc20dd6ddf..45cc20dd6ddf 100644 --- a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png +++ b/core/res/res/drawable-large-mdpi/btn_code_lock_touched_holo.png diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png b/core/res/res/drawable-large-mdpi/indicator_code_lock_drag_direction_green_up.png Binary files differindex 0bc86c36a70a..0bc86c36a70a 100644 --- a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png +++ b/core/res/res/drawable-large-mdpi/indicator_code_lock_drag_direction_green_up.png diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png b/core/res/res/drawable-large-mdpi/indicator_code_lock_drag_direction_red_up.png Binary files differindex 2ab45477a1b8..2ab45477a1b8 100644 --- a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png +++ b/core/res/res/drawable-large-mdpi/indicator_code_lock_drag_direction_red_up.png diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png b/core/res/res/drawable-large-mdpi/indicator_code_lock_point_area_default_holo.png Binary files differindex fe72d000d4bf..fe72d000d4bf 100644 --- a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png +++ b/core/res/res/drawable-large-mdpi/indicator_code_lock_point_area_default_holo.png diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png b/core/res/res/drawable-large-mdpi/indicator_code_lock_point_area_green_holo.png Binary files differindex be666c6f553c..be666c6f553c 100644 --- a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png +++ b/core/res/res/drawable-large-mdpi/indicator_code_lock_point_area_green_holo.png diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png b/core/res/res/drawable-large-mdpi/indicator_code_lock_point_area_red_holo.png Binary files differindex 962719725f26..962719725f26 100644 --- a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png +++ b/core/res/res/drawable-large-mdpi/indicator_code_lock_point_area_red_holo.png diff --git a/core/res/res/drawable-mdpi/btn_code_lock_default_holo.png b/core/res/res/drawable-mdpi/btn_code_lock_default_holo.png Binary files differindex 7d11275a7e92..82fc3b2d331f 100644 --- a/core/res/res/drawable-mdpi/btn_code_lock_default_holo.png +++ b/core/res/res/drawable-mdpi/btn_code_lock_default_holo.png diff --git a/core/res/res/drawable-mdpi/btn_code_lock_touched_holo.png b/core/res/res/drawable-mdpi/btn_code_lock_touched_holo.png Binary files differindex 7d11275a7e92..d1fe1adb6550 100644 --- a/core/res/res/drawable-mdpi/btn_code_lock_touched_holo.png +++ b/core/res/res/drawable-mdpi/btn_code_lock_touched_holo.png diff --git a/core/res/res/drawable-xhdpi/btn_code_lock_default_holo.png b/core/res/res/drawable-xhdpi/btn_code_lock_default_holo.png Binary files differnew file mode 100644 index 000000000000..f6072516b8c8 --- /dev/null +++ b/core/res/res/drawable-xhdpi/btn_code_lock_default_holo.png diff --git a/core/res/res/drawable-xhdpi/btn_code_lock_touched_holo.png b/core/res/res/drawable-xhdpi/btn_code_lock_touched_holo.png Binary files differnew file mode 100644 index 000000000000..e057cdd51c59 --- /dev/null +++ b/core/res/res/drawable-xhdpi/btn_code_lock_touched_holo.png diff --git a/core/res/res/drawable-xlarge-xhdpi/btn_code_lock_default.png b/core/res/res/drawable-xlarge-xhdpi/btn_code_lock_default.png Binary files differnew file mode 100644 index 000000000000..9f7a132dccdf --- /dev/null +++ b/core/res/res/drawable-xlarge-xhdpi/btn_code_lock_default.png diff --git a/core/res/res/drawable-xlarge-xhdpi/btn_code_lock_touched.png b/core/res/res/drawable-xlarge-xhdpi/btn_code_lock_touched.png Binary files differnew file mode 100644 index 000000000000..9f7a132dccdf --- /dev/null +++ b/core/res/res/drawable-xlarge-xhdpi/btn_code_lock_touched.png diff --git a/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml b/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml index 97790746decc..56c832cc6ea4 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_glogin_unlock.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" - android:layout_above="@+id/emergencyCall"> + android:layout_above="@+id/emergencyCallButton"> <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent"> @@ -123,7 +123,7 @@ <!-- emergency call button at bottom center --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml index 17830882b21f..6579e7633c5b 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml @@ -95,7 +95,7 @@ <!-- emergency call button NOT CURRENTLY USED --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableLeft="@drawable/ic_emergency" diff --git a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml index 63241ddf9e65..c63b0ff1ee7c 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml @@ -87,7 +87,7 @@ <!-- emergency call button --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableLeft="@drawable/ic_emergency" @@ -98,4 +98,4 @@ /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml index b8cbe51ecb97..c65dd83a0387 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_landscape.xml @@ -104,7 +104,7 @@ android:textSize="18sp" /> - <Button android:id="@+id/emergencyCall" + <Button android:id="@+id/emergencyCallButton" android:text="@android:string/lockscreen_emergency_call" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" diff --git a/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml index 009148f9c2ea..d8bea5693ade 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_sim_pin_portrait.xml @@ -93,7 +93,7 @@ android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="6dip" - android:layout_above="@id/emergencyCall" + android:layout_above="@id/emergencyCallButton" android:background="@android:drawable/divider_horizontal_dark" /> @@ -107,7 +107,7 @@ <!-- emergency call button --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableLeft="@android:drawable/ic_emergency" diff --git a/core/res/res/layout/keyguard_screen_glogin_unlock.xml b/core/res/res/layout/keyguard_screen_glogin_unlock.xml index 8a46546dee58..0e5fe78c5209 100644 --- a/core/res/res/layout/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout/keyguard_screen_glogin_unlock.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" - android:layout_above="@+id/emergencyCall"> + android:layout_above="@+id/emergencyCallButton"> <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -114,7 +114,7 @@ <!-- emergency call button at bottom center --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/core/res/res/layout/keyguard_screen_password_landscape.xml b/core/res/res/layout/keyguard_screen_password_landscape.xml index aac085371adf..937d5dcd4741 100644 --- a/core/res/res/layout/keyguard_screen_password_landscape.xml +++ b/core/res/res/layout/keyguard_screen_password_landscape.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ** -** Copyright 2008, The Android Open Source Project +** Copyright 2009, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License") ** you may not use this file except in compliance with the License. @@ -17,89 +17,170 @@ */ --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<!-- This is the general lock screen which shows information about the + state of the device, as well as instructions on how to get past it + depending on the state of the device.--> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + android:rowCount="10" + android:id="@+id/root" + android:clipChildren="false"> - <View - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - /> + <!-- Column 0 --> + <Space android:height="20dip"/> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <com.android.internal.widget.DigitalClock android:id="@+id/time" + android:layout_marginTop="16dip" + android:layout_marginBottom="8dip"> - <!-- left side: status --> - <include layout="@layout/keyguard_screen_status_land" + <!-- Because we can't have multi-tone fonts, we render two TextViews, one on + top of the other. Hence the redundant layout... --> + <TextView android:id="@+id/timeDisplayBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true"/> + android:singleLine="true" + android:ellipsize="none" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginBottom="6dip" + android:textColor="@color/lockscreen_clock_background" + /> - <!-- right side: password --> - <LinearLayout - android:layout_width="300dip" + <TextView android:id="@+id/timeDisplayForeground" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_alignParentRight="true" - android:layout_centerVertical="true"> - - <!-- Password entry field --> - <EditText android:id="@+id/passwordEntry" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:singleLine="true" - android:textStyle="normal" - android:inputType="textPassword" - android:gravity="center" - android:textSize="24sp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:background="@drawable/lockscreen_password_field_dark" - android:textColor="#ffffffff" - /> - - <!-- Numeric keyboard --> - <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" - android:layout_width="300dip" - android:layout_height="400dip" - android:background="#40000000" - android:layout_marginTop="5dip" - android:keyBackground="@drawable/btn_keyboard_key_fulltrans" - android:visibility="gone" + android:singleLine="true" + android:ellipsize="none" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginBottom="6dip" + android:textColor="@color/lockscreen_clock_foreground" + android:layout_alignLeft="@id/timeDisplayBackground" + android:layout_alignTop="@id/timeDisplayBackground" /> - </LinearLayout> - </RelativeLayout> + </com.android.internal.widget.DigitalClock> - <View - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" - /> + <TextView + android:id="@+id/date" + android:layout_below="@id/time" + android:layout_marginTop="6dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:layout_gravity="left" + /> - <!-- Alphanumeric keyboard --> - <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboardAlpha" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/password_keyboard_background_holo" - android:keyBackground="@drawable/btn_keyboard_key_fulltrans" - android:keyTextSize="18dip" - android:visibility="gone" - /> + <TextView + android:id="@+id/alarm_status" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:drawablePadding="4dip" + android:layout_marginTop="4dip" + android:layout_gravity="left" + /> + + <TextView + android:id="@+id/status1" + android:layout_marginTop="4dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:drawablePadding="4dip" + android:layout_gravity="left" + /> + + <TextView + android:id="@+id/status2" + android:layout_marginTop="4dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:drawablePadding="4dip" + android:layout_gravity="left" + /> + + <TextView + android:id="@+id/screenLocked" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:gravity="center" + android:layout_marginTop="4dip" + android:drawablePadding="4dip" + android:layout_gravity="left" + /> + + <Space android:height="20dip"/> - <!-- emergency call button NOT CURRENTLY USED --> - <Button - android:id="@+id/emergencyCall" - android:layout_width="wrap_content" + <LinearLayout android:orientation="vertical" > + + <TextView + android:id="@+id/carrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:singleLine="true" + android:ellipsize="marquee" + android:layout_gravity="bottom|left" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + /> + + <!-- "emergency calls only" shown when sim is missing or PUKd --> + <TextView + android:id="@+id/emergencyCallText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginTop="20dip" + android:singleLine="true" + android:ellipsize="marquee" + android:text="@string/emergency_calls_only" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + /> + + <Button + android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableLeft="@drawable/ic_emergency" + android:text="@string/lockscreen_emergency_call" + style="@style/Widget.Button.Transparent" + android:drawablePadding="8dip" + android:layout_marginRight="80dip" + android:visibility="visible" + /> + </LinearLayout> + + <Space android:height="20dip"/> + + <!-- Column 1 --> + <Space android:width="20dip" android:layout_columnWeight="1" android:layout_rowSpan="10" /> + + <!-- Column 2 - password entry field and PIN keyboard --> + <EditText android:id="@+id/passwordEntry" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_emergency" - android:drawablePadding="8dip" - android:text="@string/lockscreen_emergency_call" - android:visibility="gone" - style="@style/Widget.Button.Transparent" + android:layout_width="match_parent" + android:singleLine="true" + android:textStyle="normal" + android:inputType="textPassword" + android:gravity="center" + android:textSize="24sp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:background="@drawable/lockscreen_password_field_dark" + android:textColor="?android:attr/textColorPrimary" + /> + + <!-- Numeric keyboard --> + <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" + android:layout_width="300dip" + android:layout_height="300dip" + android:background="#40000000" + android:layout_marginTop="5dip" + android:keyBackground="@drawable/btn_keyboard_key_fulltrans" + android:visibility="visible" /> -</LinearLayout> +</GridLayout> diff --git a/core/res/res/layout/keyguard_screen_password_portrait.xml b/core/res/res/layout/keyguard_screen_password_portrait.xml index 7805672ba61c..30747bc72573 100644 --- a/core/res/res/layout/keyguard_screen_password_portrait.xml +++ b/core/res/res/layout/keyguard_screen_password_portrait.xml @@ -24,23 +24,26 @@ <!-- top: status --> <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginRight="16dip"> <include layout="@layout/keyguard_screen_status_port" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_alignParentLeft="true"/> + android:layout_alignParentRight="true"/> </RelativeLayout> <!-- emergency call button --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dip" + android:layout_marginRight="16dip" + android:layout_gravity="right" android:drawableLeft="@drawable/ic_emergency" android:drawablePadding="8dip" android:text="@string/lockscreen_emergency_call" - android:visibility="gone" style="@style/Widget.Button.Transparent" /> @@ -55,6 +58,8 @@ android:inputType="textPassword" android:gravity="center" android:textSize="22sp" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" android:background="@drawable/lockscreen_password_field_dark" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#ffffffff"/> @@ -83,4 +88,17 @@ android:visibility="gone" /> -</LinearLayout>
\ No newline at end of file + <TextView + android:id="@+id/carrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="8dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:drawablePadding="4dip" + android:singleLine="true" + android:ellipsize="marquee" + /> + +</LinearLayout> diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml index 244afbe0ebd8..dff2a3fdb9a7 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml @@ -102,7 +102,7 @@ android:textSize="18sp" /> - <Button android:id="@+id/emergencyCall" + <Button android:id="@+id/emergencyCallButton" android:text="@android:string/lockscreen_emergency_call" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index 009148f9c2ea..d8bea5693ade 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -93,7 +93,7 @@ android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="6dip" - android:layout_above="@id/emergencyCall" + android:layout_above="@id/emergencyCallButton" android:background="@android:drawable/divider_horizontal_dark" /> @@ -107,7 +107,7 @@ <!-- emergency call button --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableLeft="@android:drawable/ic_emergency" diff --git a/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml b/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml index d58fb232e310..11a6e12bd1f4 100644 --- a/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml +++ b/core/res/res/layout/keyguard_screen_sim_puk_landscape.xml @@ -164,7 +164,7 @@ android:textSize="18sp" /> - <Button android:id="@+id/emergencyCall" + <Button android:id="@+id/emergencyCallButton" android:text="@android:string/lockscreen_emergency_call" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" diff --git a/core/res/res/layout/keyguard_screen_sim_puk_portrait.xml b/core/res/res/layout/keyguard_screen_sim_puk_portrait.xml index 5e392efe0862..e5e045956f56 100644 --- a/core/res/res/layout/keyguard_screen_sim_puk_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_puk_portrait.xml @@ -159,7 +159,7 @@ android:layout_width="match_parent" android:layout_height="1dip" android:layout_marginTop="6dip" - android:layout_above="@id/emergencyCall" + android:layout_above="@id/emergencyCallButton" android:background="@android:drawable/divider_horizontal_dark" /> @@ -173,7 +173,7 @@ <!-- emergency call button --> <Button - android:id="@+id/emergencyCall" + android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableLeft="@android:drawable/ic_emergency" diff --git a/core/res/res/layout/keyguard_screen_status_land.xml b/core/res/res/layout/keyguard_screen_status_land.xml index 8a02e1f206b7..60dd9ffc9201 100644 --- a/core/res/res/layout/keyguard_screen_status_land.xml +++ b/core/res/res/layout/keyguard_screen_status_land.xml @@ -26,17 +26,6 @@ android:gravity="left" > - <TextView - android:id="@+id/carrier" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" - android:drawablePadding="4dip" - android:singleLine="true" - android:ellipsize="marquee" - /> - <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -52,7 +41,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="40sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" @@ -63,7 +52,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="40sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_foreground" android:layout_alignLeft="@id/timeDisplayBackground" @@ -71,19 +60,6 @@ android:layout_marginBottom="6dip" /> - <TextView android:id="@+id/am_pm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/timeDisplayBackground" - android:layout_alignBaseline="@id/timeDisplayBackground" - android:singleLine="true" - android:ellipsize="none" - android:textSize="18sp" - android:layout_marginLeft="8dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/lockscreen_clock_am_pm" - /> - </com.android.internal.widget.DigitalClock> <LinearLayout @@ -98,7 +74,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp"/> + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"/> <TextView android:id="@+id/alarm_status" @@ -106,7 +82,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="30dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp"/> + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"/> </LinearLayout> @@ -117,7 +93,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:layout_marginTop="10dip" android:drawablePadding="4dip" android:visibility="gone" @@ -129,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dip" - android:textSize="17sp" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/core/res/res/layout/keyguard_screen_status_port.xml b/core/res/res/layout/keyguard_screen_status_port.xml index 1e87fb396614..e72df5b63a53 100644 --- a/core/res/res/layout/keyguard_screen_status_port.xml +++ b/core/res/res/layout/keyguard_screen_status_port.xml @@ -25,23 +25,10 @@ android:layout_height="wrap_content" android:gravity="left"> - <TextView - android:id="@+id/carrier" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" - android:drawablePadding="4dip" - android:layout_marginTop="10dip" - android:singleLine="true" - android:ellipsize="marquee" - /> - <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:layout_marginBottom="8dip"> + android:layout_marginTop="8dip"> <!-- Because we can't have multi-tone fonts, we render two TextViews, one on top of the other. Hence the redundant layout... --> @@ -50,7 +37,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="60sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" @@ -61,7 +48,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="60sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_foreground" android:layout_marginBottom="6dip" @@ -69,19 +56,6 @@ android:layout_alignTop="@id/timeDisplayBackground" /> - <TextView android:id="@+id/am_pm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/timeDisplayBackground" - android:layout_alignBaseline="@id/timeDisplayBackground" - android:singleLine="true" - android:ellipsize="none" - android:textSize="22sp" - android:layout_marginLeft="8dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/lockscreen_clock_am_pm" - /> - </com.android.internal.widget.DigitalClock> <LinearLayout @@ -89,45 +63,50 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/time" - android:layout_marginTop="10dip"> + android:layout_marginTop="16dip" + android:layout_gravity="right"> <TextView android:id="@+id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp"/> + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"/> <TextView android:id="@+id/alarm_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="30dip" + android:layout_marginLeft="16dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp"/> + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:drawablePadding="4dip"/> </LinearLayout> - <!-- used for status such as the next alarm, and charging status. --> <TextView - android:id="@+id/status2" + android:id="@+id/status1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" + android:layout_gravity="right" + android:layout_marginTop="4dip" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="17sp" - android:layout_marginTop="10dip" - android:drawablePadding="4dip" - android:visibility="gone" /> + <!-- used for status such as the next alarm, and charging status. --> <TextView - android:id="@+id/status1" + android:id="@+id/status2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:textSize="17sp" + android:layout_gravity="right" + android:layout_alignParentTop="true" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:layout_marginTop="4dip" + android:drawablePadding="4dip" + android:visibility="gone" /> + </LinearLayout> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 7ae357a86006..020bb27742ed 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -28,43 +28,14 @@ android:id="@+id/root" android:clipChildren="false"> - <TextView - android:id="@+id/carrier" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_marginTop="10dip" - android:layout_marginRight="8dip" - android:singleLine="true" - android:ellipsize="marquee" - android:gravity="right|bottom" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - - <!-- "emergency calls only" shown when sim is missing or PUKd --> - <TextView - android:id="@+id/emergencyCallText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/carrier" - android:layout_alignParentRight="true" - android:layout_marginTop="0dip" - android:layout_marginRight="8dip" - android:text="@string/emergency_calls_only" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/white" - /> - <!-- time and date --> <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/carrier" - android:layout_marginTop="52dip" - android:layout_marginLeft="20dip" - android:layout_marginBottom="8dip" - > + android:layout_alignParentRight="true" + android:layout_marginRight="16dip" + android:layout_marginTop="48dip" + android:layout_marginLeft="20dip"> <!-- Because we can't have multi-tone fonts, we render two TextViews, one on top of the other. Hence the redundant layout... --> @@ -73,7 +44,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="72sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_background" @@ -84,7 +55,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="72sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_foreground" @@ -92,51 +63,50 @@ android:layout_alignTop="@id/timeDisplayBackground" /> - <TextView android:id="@+id/am_pm" + </com.android.internal.widget.DigitalClock> + + <LinearLayout android:id="@+id/date_alarm_status_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/time" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_marginTop="16dip" + android:layout_alignParentRight="true" + android:gravity="right" + android:orientation="horizontal"> + + <TextView + android:id="@+id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/timeDisplayBackground" - android:layout_alignBaseline="@id/timeDisplayBackground" - android:singleLine="true" - android:ellipsize="none" - android:textSize="22sp" - android:layout_marginLeft="8dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/lockscreen_clock_am_pm" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" /> - </com.android.internal.widget.DigitalClock> + <TextView + android:id="@+id/alarm_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:drawablePadding="4dip" + android:layout_marginLeft="16dip" + /> - <TextView - android:id="@+id/date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/time" - android:layout_marginLeft="24dip" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - - <!-- TODO: Redo layout when we release on phones --> - <TextView - android:id="@+id/alarm_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="18sp" - android:drawablePadding="4dip" - android:layout_below="@id/date" - android:layout_marginTop="4dip" - android:layout_marginLeft="24dip" - /> + </LinearLayout> <TextView android:id="@+id/status1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@id/alarm_status" + android:layout_below="@id/date_alarm_status_container" android:layout_marginTop="4dip" - android:layout_marginLeft="24dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_alignParentRight="true" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" /> @@ -146,9 +116,13 @@ android:layout_height="wrap_content" android:layout_below="@id/status1" android:layout_marginTop="4dip" - android:layout_marginLeft="24dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_alignParentRight="true" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" + android:visibility="gone" /> <TextView @@ -156,46 +130,89 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/status2" - android:layout_marginLeft="24dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_alignParentRight="true" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:layout_marginTop="12dip" android:drawablePadding="4dip" + android:visibility="gone" /> - <com.android.internal.widget.multiwaveview.MultiWaveView - android:id="@+id/unlock_widget" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="300dip" - android:layout_alignParentBottom="true" - - android:targetDrawables="@array/lockscreen_targets_when_silent" - android:handleDrawable="@drawable/ic_lockscreen_handle" - android:waveDrawable="@drawable/ic_lockscreen_outerring" - android:outerRadius="@*android:dimen/multiwaveview_target_placement_radius" - android:snapMargin="@*android:dimen/multiwaveview_snap_margin" - android:hitRadius="@*android:dimen/multiwaveview_hit_radius" - android:vibrationDuration="20" - android:rightChevronDrawable="@drawable/ic_lockscreen_chevron_right" - android:feedbackCount="3" - android:horizontalOffset="0dip" - android:verticalOffset="60dip" - /> - - <!-- emergency call button shown when sim is PUKd and tab_selector is - hidden --> + <!-- emergency call button shown when sim is PUKd and tab_selector is hidden --> <Button android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dip" + android:layout_marginRight="16dip" android:drawableLeft="@drawable/ic_emergency" - android:layout_centerInParent="true" - android:layout_alignParentBottom="true" - android:layout_marginBottom="80dip" + android:layout_alignParentRight="true" + android:layout_below="@id/screenLocked" style="@style/Widget.Button.Transparent" - android:drawablePadding="8dip" - android:visibility="gone" + android:drawablePadding="4dip" + android:text="@string/lockscreen_emergency_call" + android:visibility="visible" + android:background="@null" /> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:gravity="center_horizontal"> + + <com.android.internal.widget.multiwaveview.MultiWaveView + android:id="@+id/unlock_widget" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="300dip" + android:layout_alignParentBottom="true" + + android:targetDrawables="@array/lockscreen_targets_when_silent" + android:handleDrawable="@drawable/ic_lockscreen_handle" + android:waveDrawable="@drawable/ic_lockscreen_outerring" + android:outerRadius="@dimen/multiwaveview_target_placement_radius" + android:snapMargin="@dimen/multiwaveview_snap_margin" + android:hitRadius="@dimen/multiwaveview_hit_radius" + android:rightChevronDrawable="@drawable/ic_lockscreen_chevron_right" + android:horizontalOffset="0dip" + android:verticalOffset="60dip" + android:feedbackCount="3" + android:vibrationDuration="20" + /> + + <TextView + android:id="@+id/carrier" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_marginBottom="8dip" + android:gravity="center_horizontal" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + /> + + <!-- "emergency calls only" shown when sim is missing or PUKd --> + <TextView + android:id="@+id/emergencyCallText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@id/carrier" + android:gravity="center_horizontal" + android:layout_marginTop="0dip" + android:layout_marginRight="8dip" + android:text="@string/emergency_calls_only" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + /> + + </RelativeLayout> + </RelativeLayout> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index d45cc859968f..930ac332f1bb 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -32,8 +32,9 @@ <Space android:height="20dip"/> <com.android.internal.widget.DigitalClock android:id="@+id/time" - android:layout_marginTop="56dip" - android:layout_marginBottom="8dip"> + android:layout_marginTop="16dip" + android:layout_marginBottom="8dip" + android:layout_gravity="right"> <!-- Because we can't have multi-tone fonts, we render two TextViews, one on top of the other. Hence the redundant layout... --> @@ -42,7 +43,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="72sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_background" @@ -53,7 +54,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="72sp" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_foreground" @@ -61,20 +62,6 @@ android:layout_alignTop="@id/timeDisplayBackground" /> - <TextView android:id="@+id/am_pm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/timeDisplayBackground" - android:layout_alignBaseline="@id/timeDisplayBackground" - android:singleLine="true" - android:ellipsize="none" - android:textSize="22sp" - android:layout_marginLeft="8dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/lockscreen_clock_am_pm" - android:visibility="gone" - /> - </com.android.internal.widget.DigitalClock> <TextView @@ -82,46 +69,51 @@ android:layout_below="@id/time" android:layout_marginTop="6dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_gravity="left" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:layout_gravity="right" /> <TextView android:id="@+id/alarm_status" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="18sp" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" android:layout_marginTop="4dip" - android:layout_gravity="left" + android:layout_gravity="right" /> <TextView android:id="@+id/status1" android:layout_marginTop="4dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" - android:layout_gravity="left" + android:layout_gravity="right" /> <TextView android:id="@+id/status2" android:layout_marginTop="4dip" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" - android:layout_gravity="left" + android:layout_gravity="right" /> <TextView android:id="@+id/screenLocked" android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:gravity="center" android:layout_marginTop="4dip" android:drawablePadding="4dip" - android:layout_gravity="left" + android:layout_gravity="right" /> <Space android:height="20dip"/> - <LinearLayout android:orientation="horizontal" > + <LinearLayout android:orientation="vertical" + android:gravity="fill"> <TextView android:id="@+id/carrier" @@ -130,19 +122,10 @@ android:layout_alignParentTop="true" android:singleLine="true" android:ellipsize="marquee" - android:layout_gravity="bottom|left" + android:layout_gravity="right" android:textAppearance="?android:attr/textAppearanceMedium" - /> - - <Button - android:id="@+id/emergencyCallButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_emergency" - style="@style/Widget.Button.Transparent" - android:drawablePadding="8dip" - android:layout_marginRight="80dip" - android:visibility="gone" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" /> <!-- "emergency calls only" shown when sim is missing or PUKd --> @@ -152,13 +135,28 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_marginTop="20dip" + android:singleLine="true" + android:ellipsize="marquee" android:text="@string/emergency_calls_only" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/white" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:textColor="?android:attr/textColorSecondary" + android:layout_gravity="right" /> - </LinearLayout> - <Space android:height="20dip"/> + <Button + android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableLeft="@drawable/ic_emergency" + android:text="@string/lockscreen_emergency_call" + style="@style/Widget.Button.Transparent" + android:drawablePadding="8dip" + android:layout_marginRight="80dip" + android:visibility="visible" + android:layout_gravity="right" + /> + </LinearLayout> <!-- Column 1 --> <Space android:width="20dip" android:layout_columnWeight="1" android:layout_rowSpan="10" /> @@ -173,12 +171,12 @@ android:targetDrawables="@array/lockscreen_targets_when_silent" android:handleDrawable="@drawable/ic_lockscreen_handle" android:waveDrawable="@drawable/ic_lockscreen_outerring" - android:outerRadius="@*android:dimen/multiwaveview_target_placement_radius" - android:snapMargin="@*android:dimen/multiwaveview_snap_margin" - android:hitRadius="@*android:dimen/multiwaveview_hit_radius" - android:vibrationDuration="20" + android:outerRadius="@dimen/multiwaveview_target_placement_radius" + android:snapMargin="@dimen/multiwaveview_snap_margin" + android:hitRadius="@dimen/multiwaveview_hit_radius" android:topChevronDrawable="@drawable/ic_lockscreen_chevron_up" android:feedbackCount="3" + android:vibrationDuration="20" android:horizontalOffset="0dip" android:verticalOffset="0dip" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index d52bc57c8c59..8319b8a6d6e6 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -26,7 +26,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:rowCount="9"> + android:rowCount="8"> <!-- Column 0: Time, date and status --> <com.android.internal.widget.DigitalClock android:id="@+id/time" @@ -44,7 +44,7 @@ android:singleLine="true" android:ellipsize="none" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_background" /> @@ -55,7 +55,7 @@ android:singleLine="true" android:ellipsize="none" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:layout_marginBottom="6dip" android:layout_alignLeft="@id/timeDisplayBackground" android:layout_alignTop="@id/timeDisplayBackground" @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:layout_gravity="right" /> @@ -78,7 +78,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:layout_gravity="right" android:drawablePadding="4dip" /> @@ -88,47 +88,42 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:layout_gravity="right" /> - <TextView - android:id="@+id/status2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" - android:layout_gravity="right" - android:drawablePadding="4dip" - android:visibility="gone" - /> - - <Space android:layout_rowWeight="1" android:layout_columnWeight="1" /> + <!-- TODO: remove hard coded height since layout_rowWeight doesn't seem to be working --> + <Space + android:layout_height="43dip" + android:layout_gravity="fill" + android:layout_rowWeight="1" android:layout_columnWeight="1" /> <TextView android:id="@+id/carrier" android:layout_gravity="right" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:singleLine="true" android:ellipsize="marquee" /> <Button android:id="@+id/emergencyCallButton" android:layout_gravity="right" - style="@*android:style/Widget.Button.Transparent" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + style="@style/Widget.Button.Transparent" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:text="@string/lockscreen_emergency_call" - android:drawableLeft="@*android:drawable/lockscreen_emergency_button" + android:drawableLeft="@drawable/lockscreen_emergency_button" android:drawablePadding="0dip" + android:background="@null" /> <Button android:id="@+id/forgotPatternButton" android:layout_gravity="right" - style="@*android:style/Widget.Button.Transparent" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" - android:text="@*android:string/lockscreen_forgot_pattern_button_text" - android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button" + style="@style/Widget.Button.Transparent" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" + android:text="@string/lockscreen_forgot_pattern_button_text" + android:drawableLeft="@drawable/lockscreen_forgot_password_button" android:drawablePadding="0dip" + android:background="@null" /> <!-- Column 1: lock pattern --> @@ -139,6 +134,6 @@ android:layout_marginRight="8dip" android:layout_marginBottom="8dip" android:layout_marginLeft="8dip" - android:layout_rowSpan="9"/> + android:layout_rowSpan="8"/> </GridLayout> diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index 03c6022eae78..bbe2006e47d8 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -30,27 +30,28 @@ <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_marginBottom="18dip" + android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin" android:layout_gravity="right"> <!-- Because we can't have multi-tone fonts, we render two TextViews, one on top of the other. Hence the redundant layout... --> - <TextView android:id="@*android:id/timeDisplayBackground" + <TextView android:id="@+id/timeDisplayBackground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="@*android:dimen/keyguard_pattern_unlock_clock_font_size" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" - android:textColor="@*android:color/lockscreen_clock_background" + android:textColor="@color/lockscreen_clock_background" /> - <TextView android:id="@*android:id/timeDisplayForeground" + <TextView android:id="@+id/timeDisplayForeground" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="@*android:dimen/keyguard_pattern_unlock_clock_font_size" + android:textSize="@dimen/keyguard_lockscreen_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginBottom="6dip" android:textColor="@color/lockscreen_clock_foreground" @@ -60,14 +61,15 @@ <LinearLayout android:orientation="horizontal" - android:layout_gravity="right"> + android:layout_gravity="right" + android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"> <TextView android:id="@+id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@*android:dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" /> <TextView @@ -76,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@*android:dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" /> @@ -85,19 +87,24 @@ <TextView android:id="@+id/status1" + android:layout_gravity="right" + android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@*android:dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" - android:layout_gravity="right" + android:singleLine="true" + android:ellipsize="marquee" /> <TextView android:id="@+id/status2" - android:layout_alignParentTop="true" + android:layout_gravity="right" + android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin" android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="@*android:dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:drawablePadding="4dip" - android:layout_gravity="right" + android:singleLine="true" + android:ellipsize="marquee" android:visibility="gone" /> @@ -122,7 +129,7 @@ android:layout_gravity="center_horizontal" android:singleLine="true" android:ellipsize="marquee" - android:textSize="@*android:dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -136,10 +143,11 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" style="@style/Widget.Button.Transparent" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:text="@string/lockscreen_emergency_call" android:drawableLeft="@drawable/lockscreen_emergency_button" android:drawablePadding="0dip" + android:background="@null" /> <Button android:id="@+id/forgotPatternButton" @@ -147,10 +155,11 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" style="@style/Widget.Button.Transparent" - android:textSize="@dimen/keyguard_pattern_unlock_status_line_font_size" + android:textSize="@dimen/keyguard_lockscreen_status_line_font_size" android:text="@string/lockscreen_forgot_pattern_button_text" android:drawableLeft="@drawable/lockscreen_forgot_password_button" android:drawablePadding="0dip" + android:background="@null" /> </LinearLayout> diff --git a/core/res/res/values-land/dimens.xml b/core/res/res/values-land/dimens.xml index b8ce9b4bb95a..35f00772987b 100644 --- a/core/res/res/values-land/dimens.xml +++ b/core/res/res/values-land/dimens.xml @@ -32,7 +32,7 @@ <!-- Default height of an action bar. --> <dimen name="action_bar_default_height">40dip</dimen> - <!-- Size of clock font in LockScreen. --> - <dimen name="keyguard_pattern_unlock_clock_font_size">80sp</dimen> + <!-- Size of clock font in LockScreen on Unsecure unlock screen. --> + <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen> </resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 20cb85273a8f..43c7fb1fd845 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -120,13 +120,13 @@ <!-- Vertical padding around action bar icons. --> <dimen name="action_bar_icon_vertical_padding">4dip</dimen> - <!-- Size of clock font in LockScreen. --> - <dimen name="keyguard_pattern_unlock_clock_font_size">80sp</dimen> + <!-- Size of clock font in LockScreen on Unsecure unlock screen. --> + <dimen name="keyguard_lockscreen_clock_font_size">80sp</dimen> - <!-- Size of status line font in LockScreen. --> - <dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen> + <!-- Size of status line font on Unsecure unlock LockScreen. --> + <dimen name="keyguard_lockscreen_status_line_font_size">14sp</dimen> - <!-- Size of right margin in LockScreen --> - <dimen name="keyguard_pattern_unlock_status_line_font_right_margin">20dip</dimen> + <!-- Size of right margin on Unsecure unlock LockScreen --> + <dimen name="keyguard_lockscreen_status_line_font_right_margin">45dip</dimen> </resources> diff --git a/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java b/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java index c4feefd2e32c..de4ea75aec0a 100644 --- a/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/AccountUnlockScreen.java @@ -110,7 +110,7 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree mOk = (Button) findViewById(R.id.ok); mOk.setOnClickListener(this); - mEmergencyCall = (Button) findViewById(R.id.emergencyCall); + mEmergencyCall = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCall.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCall); diff --git a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java index 6734005a3256..f862d01e3ecb 100644 --- a/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java @@ -129,7 +129,7 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen | InputType.TYPE_TEXT_VARIATION_PASSWORD); } - mEmergencyCallButton = (Button) findViewById(R.id.emergencyCall); + mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCallButton.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); diff --git a/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java index 544bb3df1523..7e8d547dff8b 100644 --- a/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java @@ -109,7 +109,7 @@ public class SimPukUnlockScreen extends LinearLayout implements KeyguardScreen, mDelPinButton.setOnClickListener(this); - mEmergencyCallButton = (Button) findViewById(R.id.emergencyCall); + mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mOkButton = (TextView) findViewById(R.id.ok); mHeaderText.setText(R.string.keyguard_password_enter_puk_code); diff --git a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java index 7255c274bae5..ec917f07d070 100644 --- a/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java +++ b/policy/src/com/android/internal/policy/impl/SimUnlockScreen.java @@ -99,7 +99,7 @@ public class SimUnlockScreen extends LinearLayout implements KeyguardScreen, Vie mOkButton.setOnClickListener(this); - mEmergencyCallButton = (Button) findViewById(R.id.emergencyCall); + mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCallButton.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); |
