Merge "LockscreenTarget : Switch to dp from px for insets" into ics (4ccca1f8) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -108,18 +108,6 @@ public class MultiWaveView extends View {
		*/
		public final static int MAX_PHONE_TARGETS = 4;

		/**
		* Inset padding for lockscreen targets for tablets
		* @hide
		*/
		public final static int TABLET_TARGET_INSET = 30;

		/**
		* Inset padding for lockscreen targets for phones
		* @hide
		*/
		public final static int PHONE_TARGET_INSET = 60;

		/**
		* Empty target used to reference unused lockscreen targets
		* @hide

+4 −0

Original line number	Diff line number	Diff line
		@@ -201,4 +201,8 @@

		<!-- Minimum width for an action button in the menu area of an action bar -->
		<dimen name="action_button_min_width">56dip</dimen>

		<!-- Lockscreen target insets -->
		<item type="dimen" name="lockscreen_target_inset">25dp</item>

		</resources>

+1 −2

Original line number	Diff line number	Diff line
		@@ -267,8 +267,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen {
		mIsScreenLarge = isScreenLarge();
		ArrayList<TargetDrawable> storedDraw = new ArrayList<TargetDrawable>();
		final Resources res = getResources();
		final int targetInset = mIsScreenLarge ? MultiWaveView.TABLET_TARGET_INSET :
		MultiWaveView.PHONE_TARGET_INSET;
		final int targetInset = res.getDimensionPixelSize(com.android.internal.R.dimen.lockscreen_target_inset);
		final PackageManager packMan = mContext.getPackageManager();
		final boolean isLandscape = mCreationOrientation == Configuration.ORIENTATION_LANDSCAPE;
		final Drawable blankActiveDrawable = res.getDrawable(R.drawable.ic_lockscreen_target_activated);