Merge remote-tracking branch 'temp/nyc-dev' into nyc-dev

-keep class com.android.incallui.widget.multiwaveview.* {

  *;

}

# Keep names that are used only by animation framework.

-keepclasseswithmembers class com.android.incallui.AnimationUtils$CrossFadeDrawable {

    *** setCrossFadeAlpha(...);

}

# Any class or method annotated with NeededForTesting or NeededForReflection.

-keepclassmembers class * {

@com.android.contacts.common.test.NeededForTesting *;

@com.android.incallui.NeededForReflection *;

}

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false"

        android:zAdjustment="top">

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

            android:interpolator="@anim/decelerate_cubic"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:duration="300"/>

    <scale android:fromXScale=".8" android:toXScale="1.0"

            android:fromYScale=".8" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@anim/decelerate_cubic"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="true"

            android:duration="300"/>

</set>

 No newline at end of file

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:background="#ff000000" android:zAdjustment="normal">

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

            android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true"

            android:interpolator="@anim/decelerate_quint"

            android:duration="300"/>

</set>

 No newline at end of file

<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:fromAlpha="0.5"

    android:toAlpha="1"

    android:duration="600"

    android:repeatCount="infinite"

    android:repeatMode="reverse" />

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2010, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"

        android:factor="1.5" />