Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app" (f1eaf7f4) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ public class MultiWaveView extends View {
		mAnimatingTargets = false;
		}
		};
		private int mTargetResourceId;

		public MultiWaveView(Context context) {
		this(context, null);
		@@ -474,6 +475,7 @@ public class MultiWaveView extends View {
		Drawable drawable = array.getDrawable(i);
		targetDrawables.add(new TargetDrawable(res, drawable));
		}
		mTargetResourceId = resourceId;
		mTargetDrawables = targetDrawables;
		updateTargetPositions();
		}
		@@ -492,6 +494,10 @@ public class MultiWaveView extends View {
		}
		}

		public int getTargetResourceId() {
		return mTargetResourceId;
		}

		/**
		* Enable or disable vibrate on touch.
		*

0 → 100644

+7.92 KiB

Loading image diff...

0 → 100644

+2.35 KiB

Loading image diff...

+137 B (7.6 KiB)

Loading image diff...

+338 B (7.28 KiB)

Loading image diff...