From 0d244193bed0c995e2beaff5e217200457b28b9d Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 16 Jun 2011 17:31:21 -0700 Subject: Update pattern unlock and assets to match new UX design spec. Fix bug with LockPatternView measurement. Clean up forgotPassword/emergencyCall button code. Lots of layout tweaks. Now uses new GridLayout for many of them. New assets. Updated after review. Change-Id: I52d4ce65c6b6c644ac60eb55bb8eaff8bfeb1071 --- .../com/android/internal/widget/DigitalClock.java | 16 +- .../android/internal/widget/LockPatternView.java | 63 +++-- .../drawable-hdpi/btn_code_lock_default_holo.png | Bin 0 -> 332 bytes .../drawable-hdpi/btn_code_lock_touched_holo.png | Bin 0 -> 332 bytes core/res/res/drawable-hdpi/ic_lock_idle_alarm.png | Bin 1197 -> 830 bytes .../ic_lockscreen_emergencycall_normal.png | Bin 0 -> 915 bytes .../ic_lockscreen_emergencycall_pressed.png | Bin 0 -> 1754 bytes .../ic_lockscreen_forgotpassword_normal.png | Bin 0 -> 757 bytes .../ic_lockscreen_forgotpassword_pressed.png | Bin 0 -> 1403 bytes ...ator_code_lock_drag_direction_green_up_holo.png | Bin 0 -> 860 bytes ...icator_code_lock_drag_direction_red_up_holo.png | Bin 0 -> 1129 bytes ...indicator_code_lock_point_area_default_holo.png | Bin 0 -> 597 bytes .../indicator_code_lock_point_area_green_holo.png | Bin 0 -> 7573 bytes .../indicator_code_lock_point_area_red_holo.png | Bin 0 -> 7560 bytes .../res/drawable-mdpi/btn_code_lock_default.png | Bin 298 -> 1190 bytes .../drawable-mdpi/btn_code_lock_default_holo.png | Bin 0 -> 298 bytes .../res/drawable-mdpi/btn_code_lock_touched.png | Bin 298 -> 739 bytes .../drawable-mdpi/btn_code_lock_touched_holo.png | Bin 0 -> 298 bytes core/res/res/drawable-mdpi/ic_lock_idle_alarm.png | Bin 650 -> 585 bytes .../res/drawable-mdpi/ic_lock_idle_charging.png | Bin 679 -> 599 bytes core/res/res/drawable-mdpi/ic_lock_idle_lock.png | Bin 521 -> 547 bytes .../res/drawable-mdpi/ic_lock_idle_low_battery.png | Bin 607 -> 665 bytes .../ic_lockscreen_emergencycall_normal.png | Bin 0 -> 660 bytes .../ic_lockscreen_emergencycall_pressed.png | Bin 0 -> 1223 bytes .../ic_lockscreen_forgotpassword_normal.png | Bin 0 -> 591 bytes .../ic_lockscreen_forgotpassword_pressed.png | Bin 0 -> 947 bytes ...indicator_code_lock_drag_direction_green_up.png | Bin 573 -> 388 bytes ...ator_code_lock_drag_direction_green_up_holo.png | Bin 0 -> 573 bytes .../indicator_code_lock_drag_direction_red_up.png | Bin 729 -> 386 bytes ...icator_code_lock_drag_direction_red_up_holo.png | Bin 0 -> 729 bytes ...indicator_code_lock_point_area_default_holo.png | Bin 0 -> 481 bytes .../indicator_code_lock_point_area_green_holo.png | Bin 0 -> 4105 bytes .../indicator_code_lock_point_area_red_holo.png | Bin 0 -> 4080 bytes core/res/res/drawable-xhdpi/ic_lock_idle_alarm.png | Bin 0 -> 1157 bytes .../ic_lockscreen_emergencycall_normal.png | Bin 0 -> 1165 bytes .../ic_lockscreen_emergencycall_pressed.png | Bin 0 -> 2287 bytes .../ic_lockscreen_forgotpassword_normal.png | Bin 0 -> 957 bytes .../ic_lockscreen_forgotpassword_pressed.png | Bin 0 -> 1907 bytes ...indicator_code_lock_point_area_default_holo.png | Bin 0 -> 802 bytes .../indicator_code_lock_point_area_green_holo.png | Bin 0 -> 11979 bytes .../indicator_code_lock_point_area_red_holo.png | Bin 0 -> 11992 bytes .../drawable-xlarge-hdpi/ic_lock_idle_alarm.png | Bin 0 -> 1190 bytes .../drawable-xlarge-hdpi/ic_lock_idle_charging.png | Bin 0 -> 1249 bytes .../res/drawable-xlarge-hdpi/ic_lock_idle_lock.png | Bin 0 -> 960 bytes .../ic_lock_idle_low_battery.png | Bin 0 -> 1124 bytes .../drawable-xlarge-mdpi/btn_code_lock_default.png | Bin 0 -> 298 bytes .../drawable-xlarge-mdpi/btn_code_lock_touched.png | Bin 0 -> 298 bytes .../drawable-xlarge-mdpi/ic_lock_idle_alarm.png | Bin 0 -> 650 bytes .../drawable-xlarge-mdpi/ic_lock_idle_charging.png | Bin 0 -> 679 bytes .../res/drawable-xlarge-mdpi/ic_lock_idle_lock.png | Bin 0 -> 521 bytes .../ic_lock_idle_low_battery.png | Bin 0 -> 607 bytes ...indicator_code_lock_drag_direction_green_up.png | Bin 0 -> 573 bytes .../indicator_code_lock_drag_direction_red_up.png | Bin 0 -> 729 bytes .../indicator_code_lock_point_area_default.png | Bin 0 -> 23542 bytes .../indicator_code_lock_point_area_green.png | Bin 0 -> 15734 bytes .../indicator_code_lock_point_area_red.png | Bin 0 -> 13778 bytes .../indicator_code_lock_point_area_default.png | Bin 0 -> 72735 bytes .../indicator_code_lock_point_area_green.png | Bin 0 -> 47249 bytes .../indicator_code_lock_point_area_red.png | Bin 0 -> 41326 bytes .../res/drawable/lockscreen_emergency_button.xml | 21 ++ .../drawable/lockscreen_forgot_password_button.xml | 21 ++ .../layout-sw600dp/keyguard_screen_status_land.xml | 4 +- .../layout-sw600dp/keyguard_screen_status_port.xml | 4 +- .../keyguard_screen_unlock_landscape.xml | 40 +-- .../keyguard_screen_unlock_portrait.xml | 68 ++--- .../res/layout/keyguard_screen_tab_unlock_land.xml | 238 ++++++++--------- .../layout/keyguard_screen_unlock_landscape.xml | 290 ++++++++------------- .../res/layout/keyguard_screen_unlock_portrait.xml | 270 ++++++++----------- core/res/res/values-land/dimens.xml | 3 + core/res/res/values-sw600dp/dimens.xml | 7 + core/res/res/values/dimens.xml | 10 + .../internal/policy/impl/PatternUnlockScreen.java | 82 +++--- 72 files changed, 523 insertions(+), 614 deletions(-) create mode 100644 core/res/res/drawable-hdpi/btn_code_lock_default_holo.png create mode 100644 core/res/res/drawable-hdpi/btn_code_lock_touched_holo.png create mode 100644 core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_normal.png create mode 100644 core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_pressed.png create mode 100644 core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_normal.png create mode 100644 core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_pressed.png create mode 100644 core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up_holo.png create mode 100644 core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up_holo.png create mode 100644 core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_holo.png create mode 100644 core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_holo.png create mode 100644 core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_holo.png mode change 100644 => 100755 core/res/res/drawable-mdpi/btn_code_lock_default.png create mode 100644 core/res/res/drawable-mdpi/btn_code_lock_default_holo.png mode change 100644 => 100755 core/res/res/drawable-mdpi/btn_code_lock_touched.png create mode 100644 core/res/res/drawable-mdpi/btn_code_lock_touched_holo.png mode change 100644 => 100755 core/res/res/drawable-mdpi/ic_lock_idle_charging.png mode change 100644 => 100755 core/res/res/drawable-mdpi/ic_lock_idle_lock.png mode change 100644 => 100755 core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png create mode 100644 core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_normal.png create mode 100644 core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_pressed.png create mode 100644 core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_normal.png create mode 100644 core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_pressed.png create mode 100644 core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up_holo.png create mode 100644 core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up_holo.png create mode 100644 core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_holo.png create mode 100644 core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_holo.png create mode 100644 core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_holo.png create mode 100644 core/res/res/drawable-xhdpi/ic_lock_idle_alarm.png create mode 100644 core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_normal.png create mode 100644 core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_pressed.png create mode 100644 core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_normal.png create mode 100644 core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_pressed.png create mode 100644 core/res/res/drawable-xhdpi/indicator_code_lock_point_area_default_holo.png create mode 100644 core/res/res/drawable-xhdpi/indicator_code_lock_point_area_green_holo.png create mode 100644 core/res/res/drawable-xhdpi/indicator_code_lock_point_area_red_holo.png create mode 100644 core/res/res/drawable-xlarge-hdpi/ic_lock_idle_alarm.png create mode 100644 core/res/res/drawable-xlarge-hdpi/ic_lock_idle_charging.png create mode 100644 core/res/res/drawable-xlarge-hdpi/ic_lock_idle_lock.png create mode 100644 core/res/res/drawable-xlarge-hdpi/ic_lock_idle_low_battery.png create mode 100644 core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png create mode 100644 core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png create mode 100644 core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png create mode 100644 core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png create mode 100644 core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png create mode 100644 core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png create mode 100644 core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png create mode 100644 core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png create mode 100644 core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png create mode 100644 core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png create mode 100644 core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png create mode 100644 core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_default.png create mode 100644 core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_green.png create mode 100644 core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_red.png create mode 100644 core/res/res/drawable/lockscreen_emergency_button.xml create mode 100644 core/res/res/drawable/lockscreen_forgot_password_button.xml diff --git a/core/java/com/android/internal/widget/DigitalClock.java b/core/java/com/android/internal/widget/DigitalClock.java index 0885b6e37d29..ac0dc35d7577 100644 --- a/core/java/com/android/internal/widget/DigitalClock.java +++ b/core/java/com/android/internal/widget/DigitalClock.java @@ -96,13 +96,13 @@ public class DigitalClock extends RelativeLayout { }; static class AmPm { - private TextView mAmPm; + private TextView mAmPmTextView; private String mAmString, mPmString; AmPm(View parent, Typeface tf) { - mAmPm = (TextView) parent.findViewById(R.id.am_pm); - if (tf != null) { - mAmPm.setTypeface(tf); + mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm); + if (mAmPmTextView != null && tf != null) { + mAmPmTextView.setTypeface(tf); } String[] ampm = new DateFormatSymbols().getAmPmStrings(); @@ -111,11 +111,15 @@ public class DigitalClock extends RelativeLayout { } void setShowAmPm(boolean show) { - mAmPm.setVisibility(show ? View.VISIBLE : View.GONE); + if (mAmPmTextView != null) { + mAmPmTextView.setVisibility(show ? View.VISIBLE : View.GONE); + } } void setIsMorning(boolean isMorning) { - mAmPm.setText(isMorning ? mAmString : mPmString); + if (mAmPmTextView != null) { + mAmPmTextView.setText(isMorning ? mAmString : mPmString); + } } } diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index bee8112923a5..fd49ae3428c0 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -131,6 +131,7 @@ public class LockPatternView extends View { private int mAspect; 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. @@ -281,9 +282,14 @@ public class LockPatternView extends View { mBitmapArrowGreenUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_green_up); mBitmapArrowRedUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_red_up); - // we assume all bitmaps have the same size - mBitmapWidth = mBitmapBtnDefault.getWidth(); - mBitmapHeight = mBitmapBtnDefault.getHeight(); + // bitmaps have the size of the largest bitmap in this group + final Bitmap bitmaps[] = { mBitmapBtnDefault, mBitmapBtnTouched, mBitmapCircleDefault, + mBitmapCircleGreen, mBitmapCircleRed }; + + for (Bitmap bitmap : bitmaps) { + mBitmapWidth = Math.max(mBitmapWidth, bitmap.getWidth()); + mBitmapHeight = Math.max(mBitmapHeight, bitmap.getHeight()); + } // allow vibration pattern to be customized mVibePattern = loadVibratePattern(com.android.internal.R.array.config_virtualKeyVibePattern); @@ -458,31 +464,40 @@ public class LockPatternView extends View { break; case MeasureSpec.EXACTLY: default: - result = specSize; + // use the specified size, if non-zero + result = specSize != 0 ? specSize : desired; } return result; } + @Override + protected int getSuggestedMinimumWidth() { + // View should be large enough to contain 3 side-by-side target bitmaps + return 3 * mBitmapWidth; + } + + @Override + protected int getSuggestedMinimumHeight() { + // View should be large enough to contain 3 side-by-side target bitmaps + return 3 * mBitmapWidth; + } + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - final int minimumWidth = 3 * mBitmapCircleDefault.getWidth(); - final int minimumHeight = 3 * mBitmapCircleDefault.getHeight(); + final int minimumWidth = getSuggestedMinimumWidth(); + final int minimumHeight = getSuggestedMinimumHeight(); int viewWidth = resolveMeasured(widthMeasureSpec, minimumWidth); int viewHeight = resolveMeasured(heightMeasureSpec, minimumHeight); - int requestedWidth = MeasureSpec.getSize(widthMeasureSpec); - int requestedHeight = MeasureSpec.getSize(heightMeasureSpec); switch (mAspect) { case ASPECT_SQUARE: - viewWidth = viewHeight = Math.min(requestedWidth, requestedHeight); + viewWidth = viewHeight = Math.min(viewWidth, viewHeight); break; case ASPECT_LOCK_WIDTH: - viewWidth = requestedWidth; - viewHeight = Math.min(requestedWidth, requestedHeight); + viewHeight = Math.min(viewWidth, viewHeight); break; case ASPECT_LOCK_HEIGHT: - viewWidth = Math.min(requestedWidth, requestedHeight); - viewHeight = requestedHeight; + viewWidth = Math.min(viewWidth, viewHeight); break; } // Log.v(TAG, "LockPatternView dimensions: " + viewWidth + "x" + viewHeight); @@ -947,8 +962,8 @@ public class LockPatternView extends View { // This assumes that the arrow image is drawn at 12:00 with it's top edge // coincident with the circle bitmap's top edge. Bitmap arrow = green ? mBitmapArrowGreenUp : mBitmapArrowRedUp; - final int cellWidth = mBitmapCircleDefault.getWidth(); - final int cellHeight = mBitmapCircleDefault.getHeight(); + final int cellWidth = mBitmapWidth; + final int cellHeight = mBitmapHeight; // the up arrow bitmap is at 12:00, so find the rotation from x axis and add 90 degrees. final float theta = (float) Math.atan2( @@ -956,7 +971,12 @@ public class LockPatternView extends View { final float angle = (float) Math.toDegrees(theta) + 90.0f; // compose matrix + float sx = Math.min(mSquareWidth / mBitmapWidth, 1.0f); + float sy = Math.min(mSquareHeight / mBitmapHeight, 1.0f); mArrowMatrix.setTranslate(leftX + offsetX, topY + offsetY); // transform to cell position + mArrowMatrix.preTranslate(mBitmapWidth/2, mBitmapHeight/2); + mArrowMatrix.preScale(sx, sy); + mArrowMatrix.preTranslate(-mBitmapWidth/2, -mBitmapHeight/2); mArrowMatrix.preRotate(angle, cellWidth / 2.0f, cellHeight / 2.0f); // rotate about cell center mArrowMatrix.preTranslate((cellWidth - arrow.getWidth()) / 2.0f, 0.0f); // translate to 12:00 pos canvas.drawBitmap(arrow, mArrowMatrix, mPaint); @@ -1002,8 +1022,17 @@ public class LockPatternView extends View { int offsetX = (int) ((squareWidth - width) / 2f); int offsetY = (int) ((squareHeight - height) / 2f); - canvas.drawBitmap(outerCircle, leftX + offsetX, topY + offsetY, mPaint); - canvas.drawBitmap(innerCircle, leftX + offsetX, topY + offsetY, mPaint); + // Allow circles to shrink if the view is too small to hold them. + float sx = Math.min(mSquareWidth / mBitmapWidth, 1.0f); + float sy = Math.min(mSquareHeight / mBitmapHeight, 1.0f); + + mCircleMatrix.setTranslate(leftX + offsetX, topY + offsetY); + mCircleMatrix.preTranslate(mBitmapWidth/2, mBitmapHeight/2); + mCircleMatrix.preScale(sx, sy); + mCircleMatrix.preTranslate(-mBitmapWidth/2, -mBitmapHeight/2); + + canvas.drawBitmap(outerCircle, mCircleMatrix, mPaint); + canvas.drawBitmap(innerCircle, mCircleMatrix, mPaint); } @Override 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 new file mode 100644 index 000000000000..94d27cf3df3e Binary files /dev/null and b/core/res/res/drawable-hdpi/btn_code_lock_default_holo.png differ 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 new file mode 100644 index 000000000000..94d27cf3df3e Binary files /dev/null and b/core/res/res/drawable-hdpi/btn_code_lock_touched_holo.png differ diff --git a/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png index 6b4f66d24f80..3cadaff0f798 100644 Binary files a/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png and b/core/res/res/drawable-hdpi/ic_lock_idle_alarm.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_normal.png b/core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_normal.png new file mode 100644 index 000000000000..460495af2c30 Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_normal.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_pressed.png b/core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_pressed.png new file mode 100644 index 000000000000..b0f7ae97a1ae Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_emergencycall_pressed.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_normal.png b/core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_normal.png new file mode 100644 index 000000000000..6402d3d428b0 Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_normal.png differ diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_pressed.png b/core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_pressed.png new file mode 100644 index 000000000000..83be04650a0b Binary files /dev/null and b/core/res/res/drawable-hdpi/ic_lockscreen_forgotpassword_pressed.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up_holo.png b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up_holo.png new file mode 100644 index 000000000000..a68697507a7e Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_green_up_holo.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up_holo.png b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up_holo.png new file mode 100644 index 000000000000..92db8efa14d7 Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_drag_direction_red_up_holo.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_holo.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_holo.png new file mode 100644 index 000000000000..237011c16b44 Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_holo.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_holo.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_holo.png new file mode 100644 index 000000000000..24180178097d Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_holo.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_holo.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_holo.png new file mode 100644 index 000000000000..2120bad70380 Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_holo.png differ diff --git a/core/res/res/drawable-mdpi/btn_code_lock_default.png b/core/res/res/drawable-mdpi/btn_code_lock_default.png old mode 100644 new mode 100755 index 45cc20dd6ddf..f524317d33f8 Binary files a/core/res/res/drawable-mdpi/btn_code_lock_default.png and b/core/res/res/drawable-mdpi/btn_code_lock_default.png differ 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 new file mode 100644 index 000000000000..7d11275a7e92 Binary files /dev/null and b/core/res/res/drawable-mdpi/btn_code_lock_default_holo.png differ diff --git a/core/res/res/drawable-mdpi/btn_code_lock_touched.png b/core/res/res/drawable-mdpi/btn_code_lock_touched.png old mode 100644 new mode 100755 index 45cc20dd6ddf..5cd436c0b889 Binary files a/core/res/res/drawable-mdpi/btn_code_lock_touched.png and b/core/res/res/drawable-mdpi/btn_code_lock_touched.png differ 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 new file mode 100644 index 000000000000..7d11275a7e92 Binary files /dev/null and b/core/res/res/drawable-mdpi/btn_code_lock_touched_holo.png differ diff --git a/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png index 97ac02361a2d..b5d3e0980551 100644 Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png and b/core/res/res/drawable-mdpi/ic_lock_idle_alarm.png differ diff --git a/core/res/res/drawable-mdpi/ic_lock_idle_charging.png b/core/res/res/drawable-mdpi/ic_lock_idle_charging.png old mode 100644 new mode 100755 index 4210db26765a..20d632068c39 Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_charging.png and b/core/res/res/drawable-mdpi/ic_lock_idle_charging.png differ diff --git a/core/res/res/drawable-mdpi/ic_lock_idle_lock.png b/core/res/res/drawable-mdpi/ic_lock_idle_lock.png old mode 100644 new mode 100755 index 1060f5a8da15..0206aeef6883 Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_lock.png and b/core/res/res/drawable-mdpi/ic_lock_idle_lock.png differ diff --git a/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png b/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png old mode 100644 new mode 100755 index 72e4afa14bec..bb967829d234 Binary files a/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png and b/core/res/res/drawable-mdpi/ic_lock_idle_low_battery.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_normal.png b/core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_normal.png new file mode 100644 index 000000000000..cae795fd7547 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_normal.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_pressed.png b/core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_pressed.png new file mode 100644 index 000000000000..28679564935b Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_emergencycall_pressed.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_normal.png b/core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_normal.png new file mode 100644 index 000000000000..a7e063a5c8c1 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_normal.png differ diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_pressed.png b/core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_pressed.png new file mode 100644 index 000000000000..53af5a54faa5 Binary files /dev/null and b/core/res/res/drawable-mdpi/ic_lockscreen_forgotpassword_pressed.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png index 0bc86c36a70a..7ddeba529748 100644 Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png and b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up_holo.png b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up_holo.png new file mode 100644 index 000000000000..89d209c3c724 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_green_up_holo.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png index 2ab45477a1b8..7201e58a81c0 100644 Binary files a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png and b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up_holo.png b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up_holo.png new file mode 100644 index 000000000000..1d4cb32100d1 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_drag_direction_red_up_holo.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_holo.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_holo.png new file mode 100644 index 000000000000..a627cda96b02 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_holo.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_holo.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_holo.png new file mode 100644 index 000000000000..308624bce110 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_holo.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_holo.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_holo.png new file mode 100644 index 000000000000..6c451ec5389a Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_holo.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-xhdpi/ic_lock_idle_alarm.png new file mode 100644 index 000000000000..2822a922fa48 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lock_idle_alarm.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_normal.png b/core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_normal.png new file mode 100644 index 000000000000..a61f7a518d32 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_normal.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_pressed.png b/core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_pressed.png new file mode 100644 index 000000000000..dd5e4815b5d9 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_emergencycall_pressed.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_normal.png b/core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_normal.png new file mode 100644 index 000000000000..e4172ce65002 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_normal.png differ diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_pressed.png b/core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_pressed.png new file mode 100644 index 000000000000..e2c76217f128 Binary files /dev/null and b/core/res/res/drawable-xhdpi/ic_lockscreen_forgotpassword_pressed.png differ diff --git a/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_default_holo.png b/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_default_holo.png new file mode 100644 index 000000000000..d98a126327c2 Binary files /dev/null and b/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_default_holo.png differ diff --git a/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_green_holo.png b/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_green_holo.png new file mode 100644 index 000000000000..4491f02f9b5f Binary files /dev/null and b/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_green_holo.png differ diff --git a/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_red_holo.png b/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_red_holo.png new file mode 100644 index 000000000000..6e91fbcdf62a Binary files /dev/null and b/core/res/res/drawable-xhdpi/indicator_code_lock_point_area_red_holo.png differ diff --git a/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_alarm.png new file mode 100644 index 000000000000..29cd47139d72 Binary files /dev/null and b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_alarm.png differ diff --git a/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_charging.png b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_charging.png new file mode 100644 index 000000000000..211aa0b996a0 Binary files /dev/null and b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_charging.png differ diff --git a/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_lock.png b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_lock.png new file mode 100644 index 000000000000..683ba22ce052 Binary files /dev/null and b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_lock.png differ diff --git a/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_low_battery.png b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_low_battery.png new file mode 100644 index 000000000000..f4383f3a2f8c Binary files /dev/null and b/core/res/res/drawable-xlarge-hdpi/ic_lock_idle_low_battery.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png b/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png new file mode 100644 index 000000000000..45cc20dd6ddf Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/btn_code_lock_default.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png b/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png new file mode 100644 index 000000000000..45cc20dd6ddf Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/btn_code_lock_touched.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png new file mode 100644 index 000000000000..97ac02361a2d Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png new file mode 100644 index 000000000000..4210db26765a Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png new file mode 100644 index 000000000000..1060f5a8da15 Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png new file mode 100644 index 000000000000..72e4afa14bec Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png new file mode 100644 index 000000000000..0bc86c36a70a Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_green_up.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png new file mode 100644 index 000000000000..2ab45477a1b8 Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_drag_direction_red_up.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png new file mode 100644 index 000000000000..fe72d000d4bf Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_default.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png new file mode 100644 index 000000000000..be666c6f553c Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_green.png differ diff --git a/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png new file mode 100644 index 000000000000..962719725f26 Binary files /dev/null and b/core/res/res/drawable-xlarge-mdpi/indicator_code_lock_point_area_red.png differ diff --git a/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_default.png b/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_default.png new file mode 100644 index 000000000000..6662eb16c7e6 Binary files /dev/null and b/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_default.png differ diff --git a/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_green.png b/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_green.png new file mode 100644 index 000000000000..dce220a98a97 Binary files /dev/null and b/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_green.png differ diff --git a/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_red.png b/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_red.png new file mode 100644 index 000000000000..746a3ea415b2 Binary files /dev/null and b/core/res/res/drawable-xlarge-xhdpi/indicator_code_lock_point_area_red.png differ diff --git a/core/res/res/drawable/lockscreen_emergency_button.xml b/core/res/res/drawable/lockscreen_emergency_button.xml new file mode 100644 index 000000000000..4ec6a963e1da --- /dev/null +++ b/core/res/res/drawable/lockscreen_emergency_button.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/core/res/res/drawable/lockscreen_forgot_password_button.xml b/core/res/res/drawable/lockscreen_forgot_password_button.xml new file mode 100644 index 000000000000..6c081bf2c948 --- /dev/null +++ b/core/res/res/drawable/lockscreen_forgot_password_button.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/core/res/res/layout-sw600dp/keyguard_screen_status_land.xml b/core/res/res/layout-sw600dp/keyguard_screen_status_land.xml index 0a485e2fd0d1..302ee01c920e 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_status_land.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_status_land.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="98sp" + android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="98sp" + android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_foreground" android:layout_alignLeft="@id/timeDisplayBackground" diff --git a/core/res/res/layout-sw600dp/keyguard_screen_status_port.xml b/core/res/res/layout-sw600dp/keyguard_screen_status_port.xml index 346b21e87b84..53fe902796cf 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_status_port.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_status_port.xml @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="98sp" + android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_background" android:layout_marginBottom="6dip" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:ellipsize="none" - android:textSize="98sp" + android:textSize="@dimen/keyguard_pattern_unlock_clock_font_size" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/lockscreen_clock_foreground" android:layout_marginBottom="6dip" diff --git a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml index e3d7a3f8ee3b..7ac41b5f1913 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml @@ -56,10 +56,8 @@ android:layout_gravity="center_vertical" /> - - - - + -