LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Various fixes"

Browse Source
This commit is contained in:
Chet Haase
2010-10-07 13:18:52 -07:00
committed by Android (Google) Code Review
parent f5320adb18 45d18599b8
commit 824bec0f9c
4 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/res/anim/property_animator.xml → samples/ApiDemos/res/anim/object_animator.xml
View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<property xmlns:android="http://schemas.android.com/apk/res/android"
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="1000"
android:valueFrom="0"
android:valueTo="200"

34
samples/ApiDemos/res/layout/animator_custom_evaluator.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/container"
>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Play"
android:id="@+id/startButton"
/>
</LinearLayout>
</LinearLayout>

2
samples/ApiDemos/src/com/example/android/apis/animation/AnimationLoading.java
View File

@@ -85,7 +85,7 @@ public class AnimationLoading extends Activity {
if (animation == null) {
ObjectAnimator anim =
(ObjectAnimator) AnimatorInflater.
loadAnimator(getApplicationContext(), R.anim.property_animator);
loadAnimator(getApplicationContext(), R.anim.object_animator);
anim.addUpdateListener(this);
anim.setTarget(balls.get(0));

2
samples/ApiDemos/src/com/example/android/apis/animation/CustomEvaluator.java
View File

@@ -43,7 +43,7 @@ public class CustomEvaluator extends Activity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.animation_reversing);
setContentView(R.layout.animator_custom_evaluator);
LinearLayout container = (LinearLayout) findViewById(R.id.container);
final MyAnimationView animView = new MyAnimationView(this);
container.addView(animView);