Merge branch 'eclair' of http://github.com/Wysie/android_frameworks_base into eclair (e6ef5ba2) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -98,6 +98,8 @@ public class DragLock extends View implements LockPattern {

		private boolean mTactileFeedbackEnabled = true;

		private int mDelay = 1500;

		private float mDiameterFactor = 0.5f;
		private float mHitFactor = 0.6f;

		@@ -334,7 +336,11 @@ public class DragLock extends View implements LockPattern {
		}

		public int getIncorrectDelay() {
		return 1500;
		return mDelay;
		}

		public void setIncorrectDelay(int delay) {
		mDelay = delay;
		}

		@Override

+2 −1

Original line number	Diff line number	Diff line
		@@ -96,5 +96,6 @@ public interface LockPattern {
		public void enableInput();
		public int getCorrectDelay();
		public int getIncorrectDelay();
		public void setIncorrectDelay(int delay);
		public View getView();
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ public class LockPatternUtils {
		private final static String LOCK_SHOW_CUSTOM_MSG = "lockscreen.showcustommsg";
		private final static String LOCK_CUSTOM_MSG = "lockscreen.custommsg";
		private final static String LOCK_SHOW_SLIDERS = "lockscreen.showsliders";
		private final static String LOCK_INCORRECT_DELAY = "lockscreen.incorrectdelay";

		private static final int PIN_CHECK_TIMEOUT_MIN = 500;
		private static final int PIN_CHECK_TIMEOUT_DEFAULT = 1500;
		@@ -336,6 +337,14 @@ public class LockPatternUtils {
		return getBoolean(LOCK_SHOW_SLIDERS);
		}

		public int getIncorrectDelay() {
		return getInt(LOCK_INCORRECT_DELAY, 1500);
		}

		public void setIncorrectDelay(int delay) {
		setInt(LOCK_INCORRECT_DELAY, delay);
		}

		/**
		* Set whether tactile feedback for the pattern is enabled.
		*/

+7 −2

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ public class PinLock extends View implements LockPattern {
		private boolean mTactileFeedbackEnabled = true;
		private boolean mVisibleDots = true;
		private boolean mShowErrorPath = true;
		private int mDelay = 1500;

		private float mSquareWidth;
		private float mSquareHeight;
		@@ -238,11 +239,15 @@ public class PinLock extends View implements LockPattern {
		}

		public int getCorrectDelay() {
		return 750;
		return 0;
		}

		public int getIncorrectDelay() {
		return 1500;
		return mDelay;
		}

		public void setIncorrectDelay(int delay) {
		mDelay = delay;
		}

		private long[] loadVibratePattern(int id) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		android:id="@+id/label"
		style="?android:attr/buttonStyle"
		android:background="@drawable/btn_application_selector"
		android:layout_width="50dip"
		android:layout_width="65dip"
		android:layout_height="72dip"
		android:layout_margin="3dip"
		android:textColor="@color/primary_text_dark_focused"
		@@ -32,7 +32,7 @@
		android:paddingBottom="0dip"
		android:drawablePadding="4dip"

		android:textSize="10dip"
		android:textSize="11dip"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"