Fix 6398209: Improve MultiWaveView animations and interaction

TargetDrawables now have a "home" position they can be scaled about.
Added new "focused" state to TargetDrawable.  This is used to distinguish between highlight and selection.
Updated target icons to use new focused state. Currently re-uses "activated" icon.
Change to event handling to allow cancel events when a target is highlighted to cause a selection.
Cleaned up MultiWaveView initialization code.

MultiWaveView animation improvements:
 - new scale animation when center handle is touched.
 - switched to using indices instead of foreach loops in critical path code to avoid creating temporary objects.
 - updated and simplified animation code.

Change-Id: I593c021475f1644c73bdb9f84855e6a9fec7c0ab

Author: Jim Miller

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

@@ -32,10 +32,13 @@ public class TargetDrawable {
     public static final int[] STATE_INACTIVE =
             { android.R.attr.state_enabled, -android.R.attr.state_active };
     public static final int[] STATE_FOCUSED =
-            { android.R.attr.state_enabled, android.R.attr.state_focused };
+            { android.R.attr.state_enabled, -android.R.attr.state_active,
+                android.R.attr.state_focused };
 
     private float mTranslationX = 0.0f;
     private float mTranslationY = 0.0f;
+    private float mPositionX = 0.0f;
+    private float mPositionY = 0.0f;
     private float mScaleX = 1.0f;
     private float mScaleY = 1.0f;
     private float mAlpha = 1.0f;
@@ -196,6 +199,22 @@ public float getAlpha() {
         return mAlpha;
     }
 
+    public void setPositionX(float x) {
+        mPositionX = x;
+    }
+
+    public void setPositionY(float y) {
+        mPositionY = y;
+    }
+
+    public float getPositionX() {
+        return mPositionX;
+    }
+
+    public float getPositionY() {
+        return mPositionY;
+    }
+
     public int getWidth() {
         return mDrawable != null ? mDrawable.getIntrinsicWidth() : 0;
     }
@@ -209,8 +228,8 @@ public void draw(Canvas canvas) {
             return;
         }
         canvas.save(Canvas.MATRIX_SAVE_FLAG);
-        canvas.translate(mTranslationX, mTranslationY);
-        canvas.scale(mScaleX, mScaleY);
+        canvas.scale(mScaleX, mScaleY, mPositionX, mPositionY);
+        canvas.translate(mTranslationX + mPositionX, mTranslationY + mPositionY);
         canvas.translate(-0.5f * getWidth(), -0.5f * getHeight());
         mDrawable.setAlpha((int) Math.round(mAlpha * 255f));
         mDrawable.draw(canvas);

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

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_answer_active" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_answer_active" />
+
 </selector>

core/res/res/drawable/ic_lockscreen_answer.xml

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_camera_activated" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_camera_activated" />
+
 </selector>

core/res/res/drawable/ic_lockscreen_camera.xml

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_decline_activated" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_decline_activated" />
+
 </selector>

core/res/res/drawable/ic_lockscreen_decline.xml

@@ -17,7 +17,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval"
     >
-    <size android:height="@dimen/keyguard_lockscreen_outerring_diameter" android:width="@dimen/keyguard_lockscreen_outerring_diameter" />
+    <size android:height="@dimen/keyguard_lockscreen_outerring_diameter"
+          android:width="@dimen/keyguard_lockscreen_outerring_diameter" />
     <solid android:color="#00000000" />
     <stroke android:color="#1affffff" android:width="2dp" />
 </shape>

core/res/res/drawable/ic_lockscreen_outerring.xml

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_google_activated" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_google_activated" />
+
 </selector>

core/res/res/drawable/ic_lockscreen_search.xml

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_text_activated" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_text_activated" />
+
 </selector>

core/res/res/drawable/ic_lockscreen_send_sms.xml

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_silent_activated" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_silent_activated" />
+
 </selector>

core/res/res/drawable/ic_lockscreen_silent.xml

@@ -27,4 +27,10 @@
         android:state_focused="false"
         android:drawable="@drawable/ic_lockscreen_soundon_activated" />
 
+    <item
+        android:state_enabled="true"
+        android:state_active="false"
+        android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_soundon_activated" />
+
 </selector>