diff options
| author | Jim Miller <jaggies@google.com> | 2011-05-05 17:07:26 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2011-05-05 18:18:09 -0700 |
| commit | 46a02894a12775c16c4588a168c3cbc767a6f983 (patch) | |
| tree | 208443dd129a87a363d013495275ba5f175282af /carousel/test/res | |
| parent | 55392759e4f1fd3b17799ef8bd75d959dcf3b0a7 (diff) | |
| download | android_frameworks_ex-46a02894a12775c16c4588a168c3cbc767a6f983.tar.gz android_frameworks_ex-46a02894a12775c16c4588a168c3cbc767a6f983.tar.bz2 android_frameworks_ex-46a02894a12775c16c4588a168c3cbc767a6f983.zip | |
Fix unreported bug with CarouselTestActivity where incorrect items were shown.
The count was wrong for the number of items in the allocation pool since we
now prefetch more data.
Add demo code to show dialogs for events generated by Carousel
(select texture, select detail, long press).
Some other minor code cleanups.
Change-Id: Iebecd1945c115d96bd60a3968985c1b104b586d6
Diffstat (limited to 'carousel/test/res')
| -rw-r--r-- | carousel/test/res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/carousel/test/res/values/strings.xml b/carousel/test/res/values/strings.xml index a089aac..c0b5ce6 100644 --- a/carousel/test/res/values/strings.xml +++ b/carousel/test/res/values/strings.xml @@ -19,10 +19,10 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- General --><skip /> - <string name="music_demo_activity_label">MusicCarousel2</string> - <string name="carousel_test_activity_label">CarouselTest2</string> + <string name="music_demo_activity_label">MusicCarousel</string> + <string name="carousel_test_activity_label">CarouselTest</string> <string name="carousel_test_activity_description">An application to show the use of Carousel</string> - <string name="task_switcher_activity_label">TaskSwitcher2</string> + <string name="task_switcher_activity_label">TaskSwitcher</string> <string name="recent_tasks_title">Recent Applications</string> <string name="no_recent_tasks">No recent tasks</string> |