diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 476dd38740a42..a14fa9e64b770 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2641,6 +2641,12 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) { */ public static final String RINGLOCK_STYLE_PREF = "ringlock_style_pref"; + /** + * Sets the pattern style + * @hide + */ + public static final String PATTERN_STYLE_PREF = "pattern_style_pref"; + /** * Pulse the Trackball with Screen On. The value is boolean (1 or 0). * @hide diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 8ae5a2faea394..67c73838076f0 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -35,6 +35,8 @@ import android.os.Parcelable; import android.os.SystemClock; import android.os.Vibrator; +import android.provider.CmSystem.RinglockStyle; +import android.provider.Settings; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; @@ -274,11 +276,39 @@ public LockPatternView(Context context, AttributeSet attrs) { 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); + int ringlockStyle = Settings.System.getInt(getContext().getContentResolver(), + Settings.System.PATTERN_STYLE_PREF, RinglockStyle.getIdByStyle(RinglockStyle.Bubble)); + + switch (RinglockStyle.getStyleById(ringlockStyle)) { + case Revamped: + mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default_rev); + mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched_rev); + mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default_rev); + mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green_rev); + mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red_rev); + break; + case Holo: + 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); + break; + case Blade: + mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default_blade); + mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched_blade); + mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default_blade); + mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green_blade); + mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red_blade); + break; + default: + 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); + break; + } mBitmapArrowGreenUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_green_up); mBitmapArrowRedUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_red_up); diff --git a/core/res/res/drawable-hdpi/btn_code_lock_default_blade.png b/core/res/res/drawable-hdpi/btn_code_lock_default_blade.png new file mode 100644 index 0000000000000..51d5fa71f9c96 Binary files /dev/null and b/core/res/res/drawable-hdpi/btn_code_lock_default_blade.png differ 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 0000000000000..36ef8a3a98cf6 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_default_rev.png b/core/res/res/drawable-hdpi/btn_code_lock_default_rev.png new file mode 100644 index 0000000000000..996299ff56a7d Binary files /dev/null and b/core/res/res/drawable-hdpi/btn_code_lock_default_rev.png differ diff --git a/core/res/res/drawable-hdpi/btn_code_lock_touched_blade.png b/core/res/res/drawable-hdpi/btn_code_lock_touched_blade.png new file mode 100644 index 0000000000000..d810ca2184994 Binary files /dev/null and b/core/res/res/drawable-hdpi/btn_code_lock_touched_blade.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 0000000000000..c981d093bea23 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/btn_code_lock_touched_rev.png b/core/res/res/drawable-hdpi/btn_code_lock_touched_rev.png new file mode 100644 index 0000000000000..e10f3aaf9969b Binary files /dev/null and b/core/res/res/drawable-hdpi/btn_code_lock_touched_rev.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_blade.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_blade.png new file mode 100644 index 0000000000000..9e3ef607aeaa5 Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_blade.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 0000000000000..52f73a9badcb1 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_default_rev.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_rev.png new file mode 100644 index 0000000000000..02889bfee947a Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_default_rev.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_blade.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_blade.png new file mode 100644 index 0000000000000..07596b1a1a526 Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_blade.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 0000000000000..87ebf4ac38ba1 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_green_rev.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_rev.png new file mode 100644 index 0000000000000..6dcc3d35a8ebb Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_green_rev.png differ diff --git a/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_blade.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_blade.png new file mode 100644 index 0000000000000..e8eca5fe548c1 Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_blade.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 0000000000000..1fdc18761901d 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-hdpi/indicator_code_lock_point_area_red_rev.png b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_rev.png new file mode 100644 index 0000000000000..90e525b66e52f Binary files /dev/null and b/core/res/res/drawable-hdpi/indicator_code_lock_point_area_red_rev.png differ diff --git a/core/res/res/drawable-ldpi/btn_code_lock_default_blade.png b/core/res/res/drawable-ldpi/btn_code_lock_default_blade.png new file mode 100644 index 0000000000000..beadefa251a37 Binary files /dev/null and b/core/res/res/drawable-ldpi/btn_code_lock_default_blade.png differ diff --git a/core/res/res/drawable-ldpi/btn_code_lock_default_holo.png b/core/res/res/drawable-ldpi/btn_code_lock_default_holo.png new file mode 100644 index 0000000000000..2829648033222 Binary files /dev/null and b/core/res/res/drawable-ldpi/btn_code_lock_default_holo.png differ diff --git a/core/res/res/drawable-ldpi/btn_code_lock_default_rev.png b/core/res/res/drawable-ldpi/btn_code_lock_default_rev.png new file mode 100644 index 0000000000000..ecc64f77b827b Binary files /dev/null and b/core/res/res/drawable-ldpi/btn_code_lock_default_rev.png differ diff --git a/core/res/res/drawable-ldpi/btn_code_lock_touched_blade.png b/core/res/res/drawable-ldpi/btn_code_lock_touched_blade.png new file mode 100644 index 0000000000000..5eff9eff93bb4 Binary files /dev/null and b/core/res/res/drawable-ldpi/btn_code_lock_touched_blade.png differ diff --git a/core/res/res/drawable-ldpi/btn_code_lock_touched_holo.png b/core/res/res/drawable-ldpi/btn_code_lock_touched_holo.png new file mode 100644 index 0000000000000..c2d369607c1be Binary files /dev/null and b/core/res/res/drawable-ldpi/btn_code_lock_touched_holo.png differ diff --git a/core/res/res/drawable-ldpi/btn_code_lock_touched_rev.png b/core/res/res/drawable-ldpi/btn_code_lock_touched_rev.png new file mode 100644 index 0000000000000..aeae081783818 Binary files /dev/null and b/core/res/res/drawable-ldpi/btn_code_lock_touched_rev.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_blade.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_blade.png new file mode 100644 index 0000000000000..205684e219735 Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_blade.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_holo.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_holo.png new file mode 100644 index 0000000000000..e2c7ecc1cbee8 Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_holo.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_rev.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_rev.png new file mode 100644 index 0000000000000..7bccc5d668319 Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_default_rev.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_blade.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_blade.png new file mode 100644 index 0000000000000..be995ddaf7d3d Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_blade.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_holo.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_holo.png new file mode 100644 index 0000000000000..45ca75e83f686 Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_holo.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_rev.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_rev.png new file mode 100644 index 0000000000000..1013d4be0fbed Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_green_rev.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_blade.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_blade.png new file mode 100644 index 0000000000000..874fb80a1e78c Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_blade.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_holo.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_holo.png new file mode 100644 index 0000000000000..5cd3547b283f7 Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_holo.png differ diff --git a/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_rev.png b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_rev.png new file mode 100644 index 0000000000000..9b355f2a08109 Binary files /dev/null and b/core/res/res/drawable-ldpi/indicator_code_lock_point_area_red_rev.png differ diff --git a/core/res/res/drawable-mdpi/btn_code_lock_default_blade.png b/core/res/res/drawable-mdpi/btn_code_lock_default_blade.png new file mode 100644 index 0000000000000..d700a1a52ead2 Binary files /dev/null and b/core/res/res/drawable-mdpi/btn_code_lock_default_blade.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 0000000000000..c33ab6f3656f4 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_default_rev.png b/core/res/res/drawable-mdpi/btn_code_lock_default_rev.png new file mode 100644 index 0000000000000..595c15fb20467 Binary files /dev/null and b/core/res/res/drawable-mdpi/btn_code_lock_default_rev.png differ diff --git a/core/res/res/drawable-mdpi/btn_code_lock_touched_blade.png b/core/res/res/drawable-mdpi/btn_code_lock_touched_blade.png new file mode 100644 index 0000000000000..15e56fafbfb9d Binary files /dev/null and b/core/res/res/drawable-mdpi/btn_code_lock_touched_blade.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 0000000000000..6fb3bc969e4d1 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/btn_code_lock_touched_rev.png b/core/res/res/drawable-mdpi/btn_code_lock_touched_rev.png new file mode 100644 index 0000000000000..ffb45d565f940 Binary files /dev/null and b/core/res/res/drawable-mdpi/btn_code_lock_touched_rev.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_blade.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_blade.png new file mode 100644 index 0000000000000..319992fa2e256 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_blade.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 0000000000000..81420de125871 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_default_rev.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_rev.png new file mode 100644 index 0000000000000..1be556512b3c2 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_default_rev.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_blade.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_blade.png new file mode 100644 index 0000000000000..529509e0fdf67 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_blade.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 0000000000000..b5cdf43663006 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_green_rev.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_rev.png new file mode 100644 index 0000000000000..e39fd2a3127a7 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_green_rev.png differ diff --git a/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_blade.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_blade.png new file mode 100644 index 0000000000000..093627ffabe78 Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_blade.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 0000000000000..760dfb846fc00 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-mdpi/indicator_code_lock_point_area_red_rev.png b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_rev.png new file mode 100644 index 0000000000000..ccb83285c884e Binary files /dev/null and b/core/res/res/drawable-mdpi/indicator_code_lock_point_area_red_rev.png differ