diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-07-30 16:14:18 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2010-10-05 12:12:18 -0700 |
| commit | 40f7d44cac7589e987cdfb7ca2d852ed8c46c908 (patch) | |
| tree | df4139dcbdb8aab35faf7e501bb550f83e44a436 /apps/Development/res | |
| parent | 6f1718bab57c08e0e958595cf11fadf0ae212eff (diff) | |
| download | android_development-40f7d44cac7589e987cdfb7ca2d852ed8c46c908.tar.gz android_development-40f7d44cac7589e987cdfb7ca2d852ed8c46c908.tar.bz2 android_development-40f7d44cac7589e987cdfb7ca2d852ed8c46c908.zip | |
Add testing features to devtools
Fixed manifest with missing permission.
Added some connectivity api-tweakers
Change-Id: I10007938e28e8c0f550ae78a7cd6df4a817a8800
Diffstat (limited to 'apps/Development/res')
| -rw-r--r-- | apps/Development/res/layout/connectivity.xml | 68 | ||||
| -rw-r--r-- | apps/Development/res/values/strings.xml | 8 |
2 files changed, 70 insertions, 6 deletions
diff --git a/apps/Development/res/layout/connectivity.xml b/apps/Development/res/layout/connectivity.xml index 612304fa7..ff0c6ea6b 100644 --- a/apps/Development/res/layout/connectivity.xml +++ b/apps/Development/res/layout/connectivity.xml @@ -17,12 +17,14 @@ ** limitations under the License. */ --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" @@ -202,5 +204,59 @@ android:layout_height="wrap_content" android:text="@string/crash" /> </LinearLayout> -</LinearLayout> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <Button android:id="@+id/add_default_route" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/add_default_route" /> + <Button android:id="@+id/remove_default_route" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/remove_default_route" /> + </LinearLayout> + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <Button android:id="@+id/default_request" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/default_request" /> + <Button android:id="@+id/default_socket" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/default_socket" /> + </LinearLayout> + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <Button android:id="@+id/bound_http_request" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bound_http_request" /> + <Button android:id="@+id/bound_socket_request" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bound_socket_request" /> + </LinearLayout> + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <Button android:id="@+id/routed_http_request" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/routed_http_request" /> + <Button android:id="@+id/routed_socket_request" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/routed_socket_request" /> + </LinearLayout> + </LinearLayout> +</ScrollView> diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml index d144b8ff9..422bd7f59 100644 --- a/apps/Development/res/values/strings.xml +++ b/apps/Development/res/values/strings.xml @@ -36,6 +36,14 @@ <string name="start_hipri">Start HiPri</string> <string name="stop_hipri">Stop HiPri</string> <string name="crash">CRASH</string> + <string name="add_default_route">Add Default Route</string> + <string name="remove_default_route">Remove Default Route</string> + <string name="default_request">Make a http request</string> + <string name="default_socket">Make a raw request</string> + <string name="bound_http_request">Make bound http request</string> + <string name="bound_socket_request">Make bound socket request</string> + <string name="routed_http_request">Make routed http request</string> + <string name="routed_socket_request">Make routed socket request</string> <string name="device_info_default">unknown</string> |
