Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 535d5eda authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "New interpolator resources now found in interpolator/ directory" into honeycomb

parents 342bfbf9 efcceb85

api/current.xml

+1 −45
Original line number Diff line number Diff line
@@ -1471,17 +1471,6 @@ 
 visibility="public"

>

</constructor>

<field name="accelerate_cubic_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432589"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="accelerate_decelerate_interpolator"

 type="int"

 transient="false"
@@ -1504,17 +1493,6 @@ 
 visibility="public"

>

</field>

<field name="accelerate_quint_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432591"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="anticipate_interpolator"

 type="int"

 transient="false"
@@ -1559,17 +1537,6 @@ 
 visibility="public"

>

</field>

<field name="decelerate_cubic_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432590"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="decelerate_interpolator"

 type="int"

 transient="false"
@@ -1581,17 +1548,6 @@ 
 visibility="public"

>

</field>

<field name="decelerate_quint_interpolator"

 type="int"

 transient="false"

 volatile="false"

 value="17432592"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fade_in"

 type="int"

 transient="false"
@@ -258080,7 +258036,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/res/res/anim/accelerate_cubic_interpolator.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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.

*/

-->



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

        android:factor="1.5" />

core/res/res/anim/accelerate_quint_interpolator.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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.

*/

-->



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

        android:factor="2.5" />

core/res/res/anim/decelerate_cubic_interpolator.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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" />

core/res/res/anim/decelerate_quint_interpolator.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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="2.5" />