Skip to content

Commit dfbfd81

Browse files
djMesiasnadlabak
authored andcommitted
Added possibility to change the style of lock pattern screen (1/2)
Patch set #1: Added hdpi resources. Patch set #2: Added ldpi & mdpi resources. Patch set #3: Corrected whitespaces. Patch set #4: Separate option in Settings. Change-Id: I5138885cf71cb39fd95f4c501ab1a69b01bfad27
1 parent 2cb4320 commit dfbfd81

47 files changed

Lines changed: 41 additions & 5 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/java/android/provider/Settings.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,6 +2641,12 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
26412641
*/
26422642
public static final String RINGLOCK_STYLE_PREF = "ringlock_style_pref";
26432643

2644+
/**
2645+
* Sets the pattern style
2646+
* @hide
2647+
*/
2648+
public static final String PATTERN_STYLE_PREF = "pattern_style_pref";
2649+
26442650
/**
26452651
* Pulse the Trackball with Screen On. The value is boolean (1 or 0).
26462652
* @hide

core/java/com/android/internal/widget/LockPatternView.java

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import android.os.Parcelable;
3636
import android.os.SystemClock;
3737
import android.os.Vibrator;
38+
import android.provider.CmSystem.RinglockStyle;
39+
import android.provider.Settings;
3840
import android.util.AttributeSet;
3941
import android.util.Log;
4042
import android.view.MotionEvent;
@@ -274,11 +276,39 @@ public LockPatternView(Context context, AttributeSet attrs) {
274276
mPathPaint.setStrokeCap(Paint.Cap.ROUND);
275277

276278
// lot's of bitmaps!
277-
mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default);
278-
mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched);
279-
mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default);
280-
mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green);
281-
mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red);
279+
int ringlockStyle = Settings.System.getInt(getContext().getContentResolver(),
280+
Settings.System.PATTERN_STYLE_PREF, RinglockStyle.getIdByStyle(RinglockStyle.Bubble));
281+
282+
switch (RinglockStyle.getStyleById(ringlockStyle)) {
283+
case Revamped:
284+
mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default_rev);
285+
mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched_rev);
286+
mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default_rev);
287+
mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green_rev);
288+
mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red_rev);
289+
break;
290+
case Holo:
291+
mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default_holo);
292+
mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched_holo);
293+
mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default_holo);
294+
mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green_holo);
295+
mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red_holo);
296+
break;
297+
case Blade:
298+
mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default_blade);
299+
mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched_blade);
300+
mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default_blade);
301+
mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green_blade);
302+
mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red_blade);
303+
break;
304+
default:
305+
mBitmapBtnDefault = getBitmapFor(R.drawable.btn_code_lock_default);
306+
mBitmapBtnTouched = getBitmapFor(R.drawable.btn_code_lock_touched);
307+
mBitmapCircleDefault = getBitmapFor(R.drawable.indicator_code_lock_point_area_default);
308+
mBitmapCircleGreen = getBitmapFor(R.drawable.indicator_code_lock_point_area_green);
309+
mBitmapCircleRed = getBitmapFor(R.drawable.indicator_code_lock_point_area_red);
310+
break;
311+
}
282312

283313
mBitmapArrowGreenUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_green_up);
284314
mBitmapArrowRedUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_red_up);
3.86 KB
687 Bytes
6.24 KB
3.79 KB
600 Bytes
6.4 KB
22.8 KB
7.91 KB

0 commit comments

Comments
 (0)