diff options
author | Romain Guy <romainguy@google.com> | 2011-02-07 13:42:47 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 13:42:47 -0800 |
commit | 3e4ac8967d2f8f108eeecdc78f8128d1f12f26b6 (patch) | |
tree | dbbb8aea81b36a964d5041e3d546e43310b29b75 /tests | |
parent | e28d3e1c417fac3ebb0ccdc383c34830550c072b (diff) | |
parent | 80038fbcf629936852afba0054b26939a3a9835a (diff) | |
download | frameworks_base-3e4ac8967d2f8f108eeecdc78f8128d1f12f26b6.zip frameworks_base-3e4ac8967d2f8f108eeecdc78f8128d1f12f26b6.tar.gz frameworks_base-3e4ac8967d2f8f108eeecdc78f8128d1f12f26b6.tar.bz2 |
am 80038fbc: am ba27cf75: Merge "Empty the clip rect when intersection is empty. Bug #3410035" into honeycomb
* commit '80038fbcf629936852afba0054b26939a3a9835a':
Empty the clip rect when intersection is empty. Bug #3410035
Diffstat (limited to 'tests')
4 files changed, 118 insertions, 0 deletions
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml index 3535809..f72de12 100644 --- a/tests/HwAccelerationTest/AndroidManifest.xml +++ b/tests/HwAccelerationTest/AndroidManifest.xml @@ -32,6 +32,15 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + + <activity + android:name="MarqueeActivity" + android:label="_Marquee"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> <activity android:name="ShapesActivity" diff --git a/tests/HwAccelerationTest/res/anim/accelerate_interpolator_2.xml b/tests/HwAccelerationTest/res/anim/accelerate_interpolator_2.xml new file mode 100644 index 0000000..e4a8d48 --- /dev/null +++ b/tests/HwAccelerationTest/res/anim/accelerate_interpolator_2.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2011, 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.0"/> diff --git a/tests/HwAccelerationTest/res/anim/slide_off_left.xml b/tests/HwAccelerationTest/res/anim/slide_off_left.xml new file mode 100644 index 0000000..f05de39 --- /dev/null +++ b/tests/HwAccelerationTest/res/anim/slide_off_left.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="0%" + android:toXDelta="-100%" + android:interpolator="@anim/accelerate_interpolator_2" + android:duration="600"/>
\ No newline at end of file diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/MarqueeActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/MarqueeActivity.java new file mode 100644 index 0000000..715cdbb --- /dev/null +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/MarqueeActivity.java @@ -0,0 +1,68 @@ +/* + * 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. + */ + +package com.android.test.hwui; + +import android.app.Activity; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; +import android.widget.LinearLayout; +import android.widget.TextView; + +@SuppressWarnings({"UnusedDeclaration"}) +public class MarqueeActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + final LinearLayout linearLayout = new LinearLayout(this); + linearLayout.setOrientation(LinearLayout.VERTICAL); + + final TextView text1 = new TextView(this); + text1.setText("This is a marquee inside a TextView"); + text1.setSingleLine(true); + text1.setHorizontalFadingEdgeEnabled(true); + text1.setEllipsize(TextUtils.TruncateAt.MARQUEE); + linearLayout.addView(text1, new LinearLayout.LayoutParams( + 100, LinearLayout.LayoutParams.WRAP_CONTENT)); + + final TextView text2 = new TextView(this); + text2.setText("This is a marquee inside a TextView"); + text2.setSingleLine(true); + text2.setHorizontalFadingEdgeEnabled(true); + text2.setEllipsize(TextUtils.TruncateAt.MARQUEE); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( + 100, LinearLayout.LayoutParams.WRAP_CONTENT); + linearLayout.addView(text2, params); + + setContentView(linearLayout); + + getWindow().getDecorView().postDelayed(new Runnable() { + @Override + public void run() { + text2.setVisibility(View.INVISIBLE); + Animation animation = AnimationUtils.loadAnimation(text2.getContext(), + R.anim.slide_off_left); + animation.setFillEnabled(true); + animation.setFillAfter(true); + text2.startAnimation(animation); + } + }, 1000); + } +} |