Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chet Haase
2011-01-12 11:01:50 -08:00
committed by Android (Google) Code Review
parent 342bfbf94f efcceb856a
commit 535d5edad2
6 changed files with 1 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
api/current.xml
View File

@@ -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>

21
core/res/res/anim/accelerate_cubic_interpolator.xml
View File

@@ -1,21 +0,0 @@
<?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" />

21
core/res/res/anim/accelerate_quint_interpolator.xml
View File

@@ -1,21 +0,0 @@
<?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" />

21
core/res/res/anim/decelerate_cubic_interpolator.xml
View File

@@ -1,21 +0,0 @@
<?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" />

21
core/res/res/anim/decelerate_quint_interpolator.xml
View File

@@ -1,21 +0,0 @@
<?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" />

9
core/res/res/values/public.xml
View File

@@ -1460,15 +1460,6 @@
sinusoidal pattern. -->
<public type="interpolator" name="cycle" />
<!-- Acceleration curve matching a cubic ease in function. -->
<public type="anim" name="accelerate_cubic_interpolator" />
<!-- Acceleration curve matching a cubic ease out function. -->
<public type="anim" name="decelerate_cubic_interpolator" />
<!-- Acceleration curve matching a quint ease in function. -->
<public type="anim" name="accelerate_quint_interpolator" />
<!-- Acceleration curve matching a quint ease out function. -->
<public type="anim" name="decelerate_quint_interpolator" />
<public type="id" name="home" />
<!-- Context menu ID for the "Select text..." menu item to switch to text
selection context mode in text views. -->