summaryrefslogtreecommitdiffstats
path: root/tests/TileBenchmark/res
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-12-12 18:03:29 -0800
committerChris Craik <ccraik@google.com>2011-12-12 18:10:53 -0800
commit09a71e073aaa8566d3ca5c4881a1411841189858 (patch)
tree9ebf5b4b8d81467def528fb985dd3525cb2ace8a /tests/TileBenchmark/res
parent549d5f88bf96f93de5d10f094bda4a62ac5ebe3a (diff)
downloadframeworks_base-09a71e073aaa8566d3ca5c4881a1411841189858.zip
frameworks_base-09a71e073aaa8566d3ca5c4881a1411841189858.tar.gz
frameworks_base-09a71e073aaa8566d3ca5c4881a1411841189858.tar.bz2
Update tilebenchmark to work with current drawing infrastructure
bug:5062896 depends on external/webkit change: https://android-git.corp.google.com/g/#/c/154840/ - directly discard textures, instead of sending an invalidate through webkit - better ui on smaller screens - pass native pointer through jni calls Change-Id: Icadbf8944edc5a2b1f8dc27bab53ac665c975462
Diffstat (limited to 'tests/TileBenchmark/res')
-rw-r--r--tests/TileBenchmark/res/layout/main.xml80
1 files changed, 43 insertions, 37 deletions
diff --git a/tests/TileBenchmark/res/layout/main.xml b/tests/TileBenchmark/res/layout/main.xml
index 577c466..1b39d5d 100644
--- a/tests/TileBenchmark/res/layout/main.xml
+++ b/tests/TileBenchmark/res/layout/main.xml
@@ -18,46 +18,52 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
- <LinearLayout
- android:id="@+id/top"
- android:layout_width="match_parent"
+ <HorizontalScrollView
+ android:id="@+id/horizontalScrollView"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
- <Spinner
- android:id="@+id/movement"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:prompt="@string/movement_method"
- />
- <Spinner
- android:id="@+id/velocity"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:prompt="@string/desired_scroll_velocity"
- />
- <ToggleButton
- android:id="@+id/capture"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textOn="@string/capture_stop"
- android:textOff="@string/capture_start"
- />
- <EditText
- android:id="@+id/url"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:inputType="textUri"
- android:imeOptions="actionGo"
- android:layout_weight="1"
- />
- <Button
- android:id="@+id/inspect"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/top"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/inspect_log"
- />
- </LinearLayout>
+ >
+ <Spinner
+ android:id="@+id/movement"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:prompt="@string/movement_method"
+ />
+ <Spinner
+ android:id="@+id/velocity"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:prompt="@string/desired_scroll_velocity"
+ />
+ <ToggleButton
+ android:id="@+id/capture"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textOn="@string/capture_stop"
+ android:textOff="@string/capture_start"
+ />
+ <EditText
+ android:id="@+id/url"
+ android:layout_width="400dp"
+ android:layout_height="wrap_content"
+ android:inputType="textUri"
+ android:imeOptions="actionGo|flagNoExtractUi"
+ android:layout_weight="1"
+ />
+ <Button
+ android:id="@+id/inspect"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/inspect_log"
+ />
+ </LinearLayout>
+ </HorizontalScrollView>
<com.test.tilebenchmark.ProfiledWebView
android:id="@+id/web"
android:layout_width="match_parent"