Merge change 7535 into donut
* changes:
Adding new file in debugging section for tcpdump and other network debugging tools.
diff --git a/apps/GestureBuilder/Android.mk b/apps/GestureBuilder/Android.mk
new file mode 100644
index 0000000..a223d0d
--- /dev/null
+++ b/apps/GestureBuilder/Android.mk
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2009 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := GestureBuilder
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
diff --git a/apps/GestureBuilder/AndroidManifest.xml b/apps/GestureBuilder/AndroidManifest.xml
new file mode 100644
index 0000000..9c2f799
--- /dev/null
+++ b/apps/GestureBuilder/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2009 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.gesture.builder">
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+ <application>
+
+ <activity
+ android:name="GestureBuilderActivity"
+ android:label="@string/application_name"
+ android:icon="@drawable/ic_gesturebuilder">
+
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ </activity>
+
+ <activity
+ android:name="CreateGestureActivity"
+ android:label="@string/label_create_gesture" />
+
+ </application>
+</manifest>
diff --git a/apps/GestureBuilder/NOTICE b/apps/GestureBuilder/NOTICE
new file mode 100644
index 0000000..c5b1efa
--- /dev/null
+++ b/apps/GestureBuilder/NOTICE
@@ -0,0 +1,190 @@
+
+ Copyright (c) 2005-2008, 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.
+
+ 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.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
diff --git a/apps/GestureBuilder/graphics/gesturebuilder.ai b/apps/GestureBuilder/graphics/gesturebuilder.ai
new file mode 100644
index 0000000..2b9a2b2
--- /dev/null
+++ b/apps/GestureBuilder/graphics/gesturebuilder.ai
Binary files differ
diff --git a/apps/GestureBuilder/graphics/gesturebuilder.eps b/apps/GestureBuilder/graphics/gesturebuilder.eps
new file mode 100644
index 0000000..36a5eec
--- /dev/null
+++ b/apps/GestureBuilder/graphics/gesturebuilder.eps
Binary files differ
diff --git a/apps/GestureBuilder/res/drawable/ic_gesturebuilder.png b/apps/GestureBuilder/res/drawable/ic_gesturebuilder.png
new file mode 100644
index 0000000..1768375
--- /dev/null
+++ b/apps/GestureBuilder/res/drawable/ic_gesturebuilder.png
Binary files differ
diff --git a/apps/GestureBuilder/res/layout/create_gesture.xml b/apps/GestureBuilder/res/layout/create_gesture.xml
new file mode 100644
index 0000000..ad58ab3
--- /dev/null
+++ b/apps/GestureBuilder/res/layout/create_gesture.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="6dip"
+
+ android:text="@string/prompt_gesture_name"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <EditText
+ android:id="@+id/gesture_name"
+ android:layout_width="0dip"
+ android:layout_weight="1.0"
+ android:layout_height="wrap_content"
+
+ android:maxLength="40"
+ android:singleLine="true" />
+
+ </LinearLayout>
+
+ <android.gesture.GestureOverlayView
+ android:id="@+id/gestures_overlay"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
+
+ android:gestureStrokeType="multiple" />
+
+ <LinearLayout
+ style="@android:style/ButtonBar"
+
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/done"
+
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+
+ android:enabled="false"
+
+ android:onClick="addGesture"
+ android:text="@string/button_done" />
+
+ <Button
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+
+ android:onClick="cancelGesture"
+ android:text="@string/button_discard" />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/apps/GestureBuilder/res/layout/dialog_rename.xml b/apps/GestureBuilder/res/layout/dialog_rename.xml
new file mode 100644
index 0000000..4968944
--- /dev/null
+++ b/apps/GestureBuilder/res/layout/dialog_rename.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="20dip"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/label"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/gestures_rename_label"
+ android:gravity="left"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <EditText
+ android:id="@+id/name"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:scrollHorizontally="true"
+ android:autoText="false"
+ android:capitalize="none"
+ android:gravity="fill_horizontal"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>
diff --git a/apps/GestureBuilder/res/layout/gestures_item.xml b/apps/GestureBuilder/res/layout/gestures_item.xml
new file mode 100644
index 0000000..1563dfe
--- /dev/null
+++ b/apps/GestureBuilder/res/layout/gestures_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+
+ android:drawablePadding="12dip"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/apps/GestureBuilder/res/layout/gestures_list.xml b/apps/GestureBuilder/res/layout/gestures_list.xml
new file mode 100644
index 0000000..7e5b94a
--- /dev/null
+++ b/apps/GestureBuilder/res/layout/gestures_list.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+
+ android:orientation="vertical">
+
+ <ListView
+ android:id="@android:id/list"
+
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0" />
+
+ <TextView
+ android:id="@android:id/empty"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
+
+ android:gravity="center"
+
+ android:text="@string/gestures_loading"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <LinearLayout
+ style="@android:style/ButtonBar"
+
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/addButton"
+ android:onClick="addGesture"
+
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+
+ android:enabled="false"
+ android:text="@string/button_add" />
+
+ <Button
+ android:id="@+id/reloadButton"
+ android:onClick="reloadGestures"
+
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+
+ android:enabled="false"
+ android:text="@string/button_reload" />
+
+ </LinearLayout>
+
+</LinearLayout>
+
diff --git a/apps/GestureBuilder/res/values/colors.xml b/apps/GestureBuilder/res/values/colors.xml
new file mode 100644
index 0000000..eceb295
--- /dev/null
+++ b/apps/GestureBuilder/res/values/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources>
+ <color name="gesture_color">#FFFFFF00</color>
+</resources>
diff --git a/apps/GestureBuilder/res/values/dimens.xml b/apps/GestureBuilder/res/values/dimens.xml
new file mode 100644
index 0000000..84436fd
--- /dev/null
+++ b/apps/GestureBuilder/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<resources>
+ <dimen name="gesture_thumbnail_inset">8dip</dimen>
+ <dimen name="gesture_thumbnail_size">64dip</dimen>
+</resources>
diff --git a/apps/GestureBuilder/res/values/strings.xml b/apps/GestureBuilder/res/values/strings.xml
new file mode 100644
index 0000000..9b9ba84
--- /dev/null
+++ b/apps/GestureBuilder/res/values/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2009 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.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- General -->
+ <skip />
+ <!-- Application name -->
+ <string name="application_name">Gestures Builder</string>
+ <!-- Title, name of the activity used to create a gesture -->
+ <string name="label_create_gesture">Create a gesture</string>
+
+ <!-- Buttons -->
+ <skip />
+ <!-- Label, button used to add a gesture -->
+ <string name="button_add">Add gesture</string>
+ <!-- Label, button used to reload all gestures -->
+ <string name="button_reload">Reload</string>
+ <!-- Label, button used to cancel the operation of adding a gesture -->
+ <string name="button_discard">Discard</string>
+ <!-- Label, button used to save a gesture newly created -->
+ <string name="button_done">Done</string>
+
+ <!-- Gestures -->
+ <skip />
+ <!-- Label, prompt asking the user to enter the name of the gesture -->
+ <string name="prompt_gesture_name">Name</string>
+ <!-- Error message, informs the user he needs to enter a name before saving a gesture -->
+ <string name="error_missing_name">You must enter a name</string>
+ <!-- success message, tells the user where the gesture was saved -->
+ <string name="save_success">Gesture saved in %s</string>
+ <!-- Buttons in Rename gesture dialog box -->
+ <string name="rename_action">OK</string>
+ <!-- Buttons in Rename gesture dialog box -->
+ <string name="cancel_action">Cancel</string>
+ <!-- Message displayed when the user opens the gestures settings screen -->
+ <string name="gestures_loading">Loading gestures...</string>
+ <!-- Message displayed when the user has no gestures -->
+ <string name="gestures_empty">No gestures</string>
+ <!-- Title of the screen used to view/manage gestures -->
+ <string name="gestures_activity">Gestures</string>
+ <!-- Noun, menu item used to rename a gesture -->
+ <string name="gestures_rename">Rename</string>
+ <!-- Noun, menu item used to remove a gesture -->
+ <string name="gestures_delete">Delete</string>
+ <!-- Message displayed when a gesture is successfully deleted -->
+ <string name="gestures_delete_success">Gesture deleted</string>
+ <!-- Title of dialog box -->
+ <string name="gestures_rename_title">Rename gesture</string>
+ <!-- Label of gesture name field in Rename gesture dialog box -->
+ <string name="gestures_rename_label">Gesture name</string>
+ <!-- Message, displayed when the sdcard cannot be found, 1st parameter is the name of the file that stores the gestures -->
+ <string name="gestures_error_loading">Could not load %s. Make sure you have a mounted SD card.</string>
+</resources>
diff --git a/apps/GestureBuilder/src/com/android/gesture/builder/CreateGestureActivity.java b/apps/GestureBuilder/src/com/android/gesture/builder/CreateGestureActivity.java
new file mode 100644
index 0000000..7df985f
--- /dev/null
+++ b/apps/GestureBuilder/src/com/android/gesture/builder/CreateGestureActivity.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2009 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.gesture.builder;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.View;
+import android.view.MotionEvent;
+import android.gesture.GestureOverlayView;
+import android.gesture.Gesture;
+import android.gesture.GestureLibrary;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.File;
+
+public class CreateGestureActivity extends Activity {
+ private static final float LENGTH_THRESHOLD = 120.0f;
+
+ private Gesture mGesture;
+ private View mDoneButton;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.create_gesture);
+
+ mDoneButton = findViewById(R.id.done);
+
+ GestureOverlayView overlay = (GestureOverlayView) findViewById(R.id.gestures_overlay);
+ overlay.addOnGestureListener(new GesturesProcessor());
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ if (mGesture != null) {
+ outState.putParcelable("gesture", mGesture);
+ }
+ }
+
+ @Override
+ protected void onRestoreInstanceState(Bundle savedInstanceState) {
+ super.onRestoreInstanceState(savedInstanceState);
+
+ mGesture = savedInstanceState.getParcelable("gesture");
+ if (mGesture != null) {
+ final GestureOverlayView overlay =
+ (GestureOverlayView) findViewById(R.id.gestures_overlay);
+ overlay.post(new Runnable() {
+ public void run() {
+ overlay.setGesture(mGesture);
+ }
+ });
+
+ mDoneButton.setEnabled(true);
+ }
+ }
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public void addGesture(View v) {
+ if (mGesture != null) {
+ final TextView input = (TextView) findViewById(R.id.gesture_name);
+ final CharSequence name = input.getText();
+ if (name.length() == 0) {
+ input.setError(getString(R.string.error_missing_name));
+ return;
+ }
+
+ final GestureLibrary store = GestureBuilderActivity.getStore();
+ store.addGesture(name.toString(), mGesture);
+ store.save();
+
+ setResult(RESULT_OK);
+
+ final String path = new File(Environment.getExternalStorageDirectory(),
+ "gestures").getAbsolutePath();
+ Toast.makeText(this, getString(R.string.save_success, path), Toast.LENGTH_LONG).show();
+ } else {
+ setResult(RESULT_CANCELED);
+ }
+
+ finish();
+
+ }
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public void cancelGesture(View v) {
+ setResult(RESULT_CANCELED);
+ finish();
+ }
+
+ private class GesturesProcessor implements GestureOverlayView.OnGestureListener {
+ public void onGestureStarted(GestureOverlayView overlay, MotionEvent event) {
+ mDoneButton.setEnabled(false);
+ mGesture = null;
+ }
+
+ public void onGesture(GestureOverlayView overlay, MotionEvent event) {
+ }
+
+ public void onGestureEnded(GestureOverlayView overlay, MotionEvent event) {
+ mGesture = overlay.getGesture();
+ if (mGesture.getLength() < LENGTH_THRESHOLD) {
+ overlay.clear(false);
+ }
+ mDoneButton.setEnabled(true);
+ }
+
+ public void onGestureCancelled(GestureOverlayView overlay, MotionEvent event) {
+ }
+ }
+}
diff --git a/apps/GestureBuilder/src/com/android/gesture/builder/GestureBuilderActivity.java b/apps/GestureBuilder/src/com/android/gesture/builder/GestureBuilderActivity.java
new file mode 100644
index 0000000..51fb10f
--- /dev/null
+++ b/apps/GestureBuilder/src/com/android/gesture/builder/GestureBuilderActivity.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2009 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.gesture.builder;
+
+import android.app.Dialog;
+import android.app.AlertDialog;
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.os.AsyncTask;
+import android.os.Environment;
+import android.view.View;
+import android.view.ContextMenu;
+import android.view.MenuItem;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.gesture.GestureLibrary;
+import android.gesture.Gesture;
+import android.gesture.GestureLibraries;
+import android.widget.TextView;
+import android.widget.EditText;
+import android.widget.AdapterView;
+import android.widget.Toast;
+import android.widget.ArrayAdapter;
+import android.content.DialogInterface;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.text.TextUtils;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.BitmapDrawable;
+
+import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Comparator;
+import java.util.Set;
+import java.io.File;
+
+public class GestureBuilderActivity extends ListActivity {
+ private static final int STATUS_SUCCESS = 0;
+ private static final int STATUS_CANCELLED = 1;
+ private static final int STATUS_NO_STORAGE = 2;
+ private static final int STATUS_NOT_LOADED = 3;
+
+ private static final int MENU_ID_RENAME = 1;
+ private static final int MENU_ID_REMOVE = 2;
+
+ private static final int DIALOG_RENAME_GESTURE = 1;
+
+ private static final int REQUEST_NEW_GESTURE = 1;
+
+ // Type: long (id)
+ private static final String GESTURES_INFO_ID = "gestures.info_id";
+
+ private final File mStoreFile = new File(Environment.getExternalStorageDirectory(), "gestures");
+
+ private final Comparator<NamedGesture> mSorter = new Comparator<NamedGesture>() {
+ public int compare(NamedGesture object1, NamedGesture object2) {
+ return object1.name.compareTo(object2.name);
+ }
+ };
+
+ private static GestureLibrary sStore;
+
+ private GesturesAdapter mAdapter;
+ private GesturesLoadTask mTask;
+ private TextView mEmpty;
+
+ private Dialog mRenameDialog;
+ private EditText mInput;
+ private NamedGesture mCurrentRenameGesture;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.gestures_list);
+
+ mAdapter = new GesturesAdapter(this);
+ setListAdapter(mAdapter);
+
+ if (sStore == null) {
+ sStore = GestureLibraries.fromFile(mStoreFile);
+ }
+ mEmpty = (TextView) findViewById(android.R.id.empty);
+ loadGestures();
+
+ registerForContextMenu(getListView());
+ }
+
+ static GestureLibrary getStore() {
+ return sStore;
+ }
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public void reloadGestures(View v) {
+ loadGestures();
+ }
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public void addGesture(View v) {
+ Intent intent = new Intent(this, CreateGestureActivity.class);
+ startActivityForResult(intent, REQUEST_NEW_GESTURE);
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+
+ if (resultCode == RESULT_OK) {
+ switch (requestCode) {
+ case REQUEST_NEW_GESTURE:
+ loadGestures();
+ break;
+ }
+ }
+ }
+
+ private void loadGestures() {
+ if (mTask != null && mTask.getStatus() != GesturesLoadTask.Status.FINISHED) {
+ mTask.cancel(true);
+ }
+ mTask = (GesturesLoadTask) new GesturesLoadTask().execute();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ if (mTask != null && mTask.getStatus() != GesturesLoadTask.Status.FINISHED) {
+ mTask.cancel(true);
+ mTask = null;
+ }
+
+ cleanupRenameDialog();
+ }
+
+ private void checkForEmpty() {
+ if (mAdapter.getCount() == 0) {
+ mEmpty.setText(R.string.gestures_empty);
+ }
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ if (mCurrentRenameGesture != null) {
+ outState.putLong(GESTURES_INFO_ID, mCurrentRenameGesture.gesture.getID());
+ }
+ }
+
+ @Override
+ protected void onRestoreInstanceState(Bundle state) {
+ super.onRestoreInstanceState(state);
+
+ long id = state.getLong(GESTURES_INFO_ID, -1);
+ if (id != -1) {
+ final Set<String> entries = sStore.getGestureEntries();
+out: for (String name : entries) {
+ for (Gesture gesture : sStore.getGestures(name)) {
+ if (gesture.getID() == id) {
+ mCurrentRenameGesture = new NamedGesture();
+ mCurrentRenameGesture.name = name;
+ mCurrentRenameGesture.gesture = gesture;
+ break out;
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View v,
+ ContextMenu.ContextMenuInfo menuInfo) {
+
+ super.onCreateContextMenu(menu, v, menuInfo);
+
+ AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
+ menu.setHeaderTitle(((TextView) info.targetView).getText());
+
+ menu.add(0, MENU_ID_RENAME, 0, R.string.gestures_rename);
+ menu.add(0, MENU_ID_REMOVE, 0, R.string.gestures_delete);
+ }
+
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
+ final AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo)
+ item.getMenuInfo();
+ final NamedGesture gesture = (NamedGesture) menuInfo.targetView.getTag();
+
+ switch (item.getItemId()) {
+ case MENU_ID_RENAME:
+ renameGesture(gesture);
+ return true;
+ case MENU_ID_REMOVE:
+ deleteGesture(gesture);
+ return true;
+ }
+
+ return super.onContextItemSelected(item);
+ }
+
+ private void renameGesture(NamedGesture gesture) {
+ mCurrentRenameGesture = gesture;
+ showDialog(DIALOG_RENAME_GESTURE);
+ }
+
+ @Override
+ protected Dialog onCreateDialog(int id) {
+ if (id == DIALOG_RENAME_GESTURE) {
+ return createRenameDialog();
+ }
+ return super.onCreateDialog(id);
+ }
+
+ @Override
+ protected void onPrepareDialog(int id, Dialog dialog) {
+ super.onPrepareDialog(id, dialog);
+ if (id == DIALOG_RENAME_GESTURE) {
+ mInput.setText(mCurrentRenameGesture.name);
+ }
+ }
+
+ private Dialog createRenameDialog() {
+ final View layout = View.inflate(this, R.layout.dialog_rename, null);
+ mInput = (EditText) layout.findViewById(R.id.name);
+ ((TextView) layout.findViewById(R.id.label)).setText(R.string.gestures_rename_label);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setIcon(0);
+ builder.setTitle(getString(R.string.gestures_rename_title));
+ builder.setCancelable(true);
+ builder.setOnCancelListener(new Dialog.OnCancelListener() {
+ public void onCancel(DialogInterface dialog) {
+ cleanupRenameDialog();
+ }
+ });
+ builder.setNegativeButton(getString(R.string.cancel_action),
+ new Dialog.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ cleanupRenameDialog();
+ }
+ }
+ );
+ builder.setPositiveButton(getString(R.string.rename_action),
+ new Dialog.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ changeGestureName();
+ }
+ }
+ );
+ builder.setView(layout);
+ return builder.create();
+ }
+
+ private void changeGestureName() {
+ final String name = mInput.getText().toString();
+ if (!TextUtils.isEmpty(name)) {
+ final NamedGesture renameGesture = mCurrentRenameGesture;
+ final GesturesAdapter adapter = mAdapter;
+ final int count = adapter.getCount();
+
+ // Simple linear search, there should not be enough items to warrant
+ // a more sophisticated search
+ for (int i = 0; i < count; i++) {
+ final NamedGesture gesture = adapter.getItem(i);
+ if (gesture.gesture.getID() == renameGesture.gesture.getID()) {
+ sStore.removeGesture(gesture.name, gesture.gesture);
+ gesture.name = mInput.getText().toString();
+ sStore.addGesture(gesture.name, gesture.gesture);
+ break;
+ }
+ }
+
+ adapter.notifyDataSetChanged();
+ }
+ mCurrentRenameGesture = null;
+ }
+
+ private void cleanupRenameDialog() {
+ if (mRenameDialog != null) {
+ mRenameDialog.dismiss();
+ mRenameDialog = null;
+ }
+ mCurrentRenameGesture = null;
+ }
+
+ private void deleteGesture(NamedGesture gesture) {
+ sStore.removeGesture(gesture.name, gesture.gesture);
+ sStore.save();
+
+ final GesturesAdapter adapter = mAdapter;
+ adapter.setNotifyOnChange(false);
+ adapter.remove(gesture);
+ adapter.sort(mSorter);
+ checkForEmpty();
+ adapter.notifyDataSetChanged();
+
+ Toast.makeText(this, R.string.gestures_delete_success, Toast.LENGTH_SHORT).show();
+ }
+
+ private class GesturesLoadTask extends AsyncTask<Void, NamedGesture, Integer> {
+ private int mThumbnailSize;
+ private int mThumbnailInset;
+ private int mPathColor;
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+
+ final Resources resources = getResources();
+ mPathColor = resources.getColor(R.color.gesture_color);
+ mThumbnailInset = (int) resources.getDimension(R.dimen.gesture_thumbnail_inset);
+ mThumbnailSize = (int) resources.getDimension(R.dimen.gesture_thumbnail_size);
+
+ findViewById(R.id.addButton).setEnabled(false);
+ findViewById(R.id.reloadButton).setEnabled(false);
+
+ mAdapter.setNotifyOnChange(false);
+ mAdapter.clear();
+ }
+
+ protected Integer doInBackground(Void... params) {
+ if (isCancelled()) return STATUS_CANCELLED;
+ if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+ return STATUS_NO_STORAGE;
+ }
+
+ final GestureLibrary store = sStore;
+
+ if (store.load()) {
+ for (String name : store.getGestureEntries()) {
+ if (isCancelled()) break;
+
+ for (Gesture gesture : store.getGestures(name)) {
+ final Bitmap bitmap = gesture.toBitmap(mThumbnailSize, mThumbnailSize,
+ mThumbnailInset, mPathColor);
+ final NamedGesture namedGesture = new NamedGesture();
+ namedGesture.gesture = gesture;
+ namedGesture.name = name;
+
+ mAdapter.addBitmap(namedGesture.gesture.getID(), bitmap);
+ publishProgress(namedGesture);
+ }
+ }
+
+ return STATUS_SUCCESS;
+ }
+
+ return STATUS_NOT_LOADED;
+ }
+
+ @Override
+ protected void onProgressUpdate(NamedGesture... values) {
+ super.onProgressUpdate(values);
+
+ final GesturesAdapter adapter = mAdapter;
+ adapter.setNotifyOnChange(false);
+
+ for (NamedGesture gesture : values) {
+ adapter.add(gesture);
+ }
+
+ adapter.sort(mSorter);
+ adapter.notifyDataSetChanged();
+ }
+
+ @Override
+ protected void onPostExecute(Integer result) {
+ super.onPostExecute(result);
+
+ if (result == STATUS_NO_STORAGE) {
+ mList.setVisibility(View.GONE);
+ mEmpty.setVisibility(View.VISIBLE);
+ mEmpty.setText(getString(R.string.gestures_error_loading,
+ mStoreFile.getAbsolutePath()));
+ } else {
+ findViewById(R.id.addButton).setEnabled(true);
+ findViewById(R.id.reloadButton).setEnabled(true);
+ checkForEmpty();
+ }
+ }
+ }
+
+ static class NamedGesture {
+ String name;
+ Gesture gesture;
+ }
+
+ private class GesturesAdapter extends ArrayAdapter<NamedGesture> {
+ private final LayoutInflater mInflater;
+ private final Map<Long, Drawable> mThumbnails = Collections.synchronizedMap(
+ new HashMap<Long, Drawable>());
+
+ public GesturesAdapter(Context context) {
+ super(context, 0);
+ mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ }
+
+ void addBitmap(Long id, Bitmap bitmap) {
+ mThumbnails.put(id, new BitmapDrawable(bitmap));
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ if (convertView == null) {
+ convertView = mInflater.inflate(R.layout.gestures_item, parent, false);
+ }
+
+ final NamedGesture gesture = getItem(position);
+ final TextView label = (TextView) convertView;
+
+ label.setTag(gesture);
+ label.setText(gesture.name);
+ label.setCompoundDrawablesWithIntrinsicBounds(mThumbnails.get(gesture.gesture.getID()),
+ null, null, null);
+
+ return convertView;
+ }
+ }
+}
diff --git a/testrunner/android_manifest.py b/testrunner/android_manifest.py
new file mode 100644
index 0000000..7ede96c
--- /dev/null
+++ b/testrunner/android_manifest.py
@@ -0,0 +1,60 @@
+#!/usr/bin/python2.4
+#
+#
+# Copyright 2009, 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.
+
+"""In memory representation of AndroidManifest.xml file.
+
+Specification of AndroidManifest.xml can be found at
+http://developer.android.com/guide/topics/manifest/manifest-intro.html
+"""
+
+# python imports
+import xml.dom.minidom
+import xml.parsers
+
+
+class AndroidManifest(object):
+ """In memory representation of AndroidManifest.xml file."""
+
+ FILENAME = "AndroidManifest.xml"
+
+ def __init__(self, app_path=None):
+ if app_path:
+ self.ParseManifest(app_path)
+
+ def GetPackageName(self):
+ """Retrieve package name defined at <manifest package="...">.
+
+ Returns:
+ Package name if defined, otherwise None
+ """
+ manifests = self._dom.getElementsByTagName("manifest")
+ if not manifests or not manifests[0].getAttribute("package"):
+ return None
+ return manifests[0].getAttribute("package")
+
+ def ParseManifest(self, app_path):
+ """Parse AndroidManifest.xml at the specified path.
+
+ Args:
+ app_path: path to folder containing AndroidManifest.xml
+ Raises:
+ IOError: AndroidManifest.xml cannot be found at given path, or cannot be
+ opened for reading
+ """
+ self.app_path = app_path.rstrip("/")
+ self.manifest_path = "%s/%s" % (self.app_path, self.FILENAME)
+ self._dom = xml.dom.minidom.parse(self.manifest_path)
diff --git a/testrunner/android_mk.py b/testrunner/android_mk.py
new file mode 100644
index 0000000..663aa5c
--- /dev/null
+++ b/testrunner/android_mk.py
@@ -0,0 +1,96 @@
+#!/usr/bin/python2.4
+#
+#
+# Copyright 2009, 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.
+
+"""In memory representation of Android.mk file.
+
+Specifications for Android.mk can be found at
+development/ndk/docs/ANDROID-MK.txt
+"""
+
+import re
+from sets import Set
+
+
+class AndroidMK(object):
+ """In memory representation of Android.mk file."""
+
+ _RE_INCLUDE = re.compile(r'include\s+\$\((.+)\)')
+ _VAR_DELIMITER = ":="
+ FILENAME = "Android.mk"
+ CERTIFICATE = "LOCAL_CERTIFICATE"
+ PACKAGE_NAME = "LOCAL_PACKAGE_NAME"
+
+ def __init__(self, app_path=None):
+ self._includes = Set() # variables included in makefile
+ self._variables = {} # variables defined in makefile
+
+ if app_path:
+ self.ParseMK(app_path)
+
+ def _ProcessMKLine(self, line):
+ """Add a variable definition or include.
+
+ Ignores unrecognized lines.
+
+ Args:
+ line: line of text from makefile
+ """
+ m = self._RE_INCLUDE.match(line)
+ if m:
+ self._includes.add(m.group(1))
+ else:
+ parts = line.split(self._VAR_DELIMITER)
+ if len(parts) > 1:
+ self._variables[parts[0].strip()] = parts[1].strip()
+
+ def GetVariable(self, identifier):
+ """Retrieve makefile variable.
+
+ Args:
+ identifier: name of variable to retrieve
+ Returns:
+ value of specified identifier, None if identifier not found in makefile
+ """
+ # use dict.get(x) rather than dict[x] to avoid KeyError exception,
+ # so None is returned if identifier not found
+ return self._variables.get(identifier, None)
+
+ def HasInclude(self, identifier):
+ """Check variable is included in makefile.
+
+ Args:
+ identifer: name of variable to check
+ Returns:
+ True if identifer is included in makefile, otherwise False
+ """
+ return identifier in self._includes
+
+ def ParseMK(self, app_path):
+ """Parse Android.mk at the specified path.
+
+ Args:
+ app_path: path to folder containing Android.mk
+ Raises:
+ IOError: Android.mk cannot be found at given path, or cannot be opened
+ for reading
+ """
+ self.app_path = app_path.rstrip("/")
+ self.mk_path = "%s/%s" % (self.app_path, self.FILENAME)
+ mk = open(self.mk_path)
+ for line in mk:
+ self._ProcessMKLine(line)
+ mk.close()
diff --git a/testrunner/create_test.py b/testrunner/create_test.py
new file mode 100755
index 0000000..2fc3a3c
--- /dev/null
+++ b/testrunner/create_test.py
@@ -0,0 +1,245 @@
+#!/usr/bin/python2.4
+#
+#
+# Copyright 2009, 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.
+
+"""Utility to create Android project files for tests."""
+
+# python imports
+import datetime
+import optparse
+import os
+import string
+import sys
+
+# local imports
+import android_mk
+import android_manifest
+
+
+class TestsConsts(object):
+ """Constants for test Android.mk and AndroidManifest.xml creation."""
+
+ MK_BUILD_INCLUDE = "call all-makefiles-under,$(LOCAL_PATH)"
+ MK_BUILD_STRING = "\ninclude $(%s)\n" % MK_BUILD_INCLUDE
+ TEST_MANIFEST_TEMPLATE = """<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) $YEAR 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="$PACKAGE_NAME.tests">
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="$PACKAGE_NAME"
+ android:label="Tests for $MODULE_NAME">
+ </instrumentation>
+</manifest>
+"""
+ TEST_MK_TEMPLATE = """LOCAL_PATH := $$(call my-dir)
+include $$(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_SRC_FILES := $$(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := ${MODULE_NAME}Tests${CERTIFICATE}
+
+LOCAL_INSTRUMENTATION_FOR := ${MODULE_NAME}
+
+LOCAL_SDK_VERSION := current
+
+include $$(BUILD_PACKAGE)
+"""
+ TESTS_FOLDER = "tests"
+
+
+def _GenerateTestManifest(manifest, module_name, mapping=None):
+ """Create and populate tests/AndroidManifest.xml with variable values from
+ Android.mk and AndroidManifest.xml.
+
+ Does nothing if tests/AndroidManifest.xml already exists.
+
+ Args:
+ manifest: AndroidManifest object for application manifest
+ module_name: module name used for labelling
+ mapping: optional user defined mapping of variable values, replaces values
+ extracted from AndroidManifest.xml
+ Raises:
+ IOError: tests/AndroidManifest.xml cannot be opened for writing
+ """
+ # skip if file already exists
+ tests_path = "%s/%s" % (manifest.app_path, TestsConsts.TESTS_FOLDER)
+ tests_manifest_path = "%s/%s" % (tests_path, manifest.FILENAME)
+ if os.path.exists(tests_manifest_path):
+ _PrintMessage("%s already exists, not overwritten" % tests_manifest_path)
+ return
+
+ if not mapping:
+ package_name = manifest.GetPackageName()
+ mapping = {"PACKAGE_NAME":package_name, "MODULE_NAME":module_name,
+ "YEAR":datetime.date.today().year}
+ output = string.Template(TestsConsts.TEST_MANIFEST_TEMPLATE).substitute(mapping)
+
+ # create tests folder if not existent
+ if not os.path.exists(tests_path):
+ os.mkdir(tests_path)
+
+ # write tests/AndroidManifest.xml
+ tests_manifest = open(tests_manifest_path, mode="w")
+ tests_manifest.write(output)
+ tests_manifest.close()
+ _PrintMessage("Created %s" % tests_manifest_path)
+
+
+def _GenerateTestMK(mk, mapping=None):
+ """Create and populate tests/Android.mk with variable values from Android.mk.
+
+ Does nothing if tests/Android.mk already exists.
+
+ Args:
+ mk: AndroidMK object for application makefile
+ mapping: optional user defined mapping of variable values, replaces
+ values stored in mk
+ Raises:
+ IOError: tests/Android.mk cannot be opened for writing
+ """
+ # skip if file already exists
+ tests_path = "%s/%s" % (mk.app_path, TestsConsts.TESTS_FOLDER)
+ tests_mk_path = "%s/%s" % (tests_path, mk.FILENAME)
+ if os.path.exists(tests_mk_path):
+ _PrintMessage("%s already exists, not overwritten" % tests_mk_path)
+ return
+
+ # append test build if not existent in makefile
+ if not mk.HasInclude(TestsConsts.MK_BUILD_INCLUDE):
+ mk_path = "%s/%s" % (mk.app_path, mk.FILENAME)
+ mk_file = open(mk_path, mode="a")
+ mk_file.write(TestsConsts.MK_BUILD_STRING)
+ mk_file.close()
+
+ # construct tests/Android.mk
+ # include certificate definition if existent in makefile
+ certificate = mk.GetVariable(mk.CERTIFICATE)
+ if certificate:
+ cert_definition = ("\n%s := %s" % (mk.CERTIFICATE, certificate))
+ else:
+ cert_definition = ""
+ if not mapping:
+ module_name = mk.GetVariable(mk.PACKAGE_NAME)
+ mapping = {"MODULE_NAME":module_name, "CERTIFICATE":cert_definition}
+ output = string.Template(TestsConsts.TEST_MK_TEMPLATE).substitute(mapping)
+
+ # create tests folder if not existent
+ if not os.path.exists(tests_path):
+ os.mkdir(tests_path)
+
+ # write tests/Android.mk to disk
+ tests_mk = open(tests_mk_path, mode="w")
+ tests_mk.write(output)
+ tests_mk.close()
+ _PrintMessage("Created %s" % tests_mk_path)
+
+
+def _ParseArgs(argv):
+ """Parse the command line arguments.
+
+ Args:
+ argv: the list of command line arguments
+ Returns:
+ a tuple of options and individual command line arguments.
+ """
+ parser = optparse.OptionParser(usage="%s <app_path>" % sys.argv[0])
+ options, args = parser.parse_args(argv)
+ if len(args) < 1:
+ _PrintError("Error: Incorrect syntax")
+ parser.print_usage()
+ sys.exit()
+ return (options, args)
+
+
+def _PrintMessage(msg):
+ print >> sys.stdout, msg
+
+
+def _PrintError(msg):
+ print >> sys.stderr, msg
+
+
+def _ValidateInputFiles(mk, manifest):
+ """Verify that required variables are defined in input files.
+
+ Args:
+ mk: AndroidMK object for application makefile
+ manifest: AndroidManifest object for application manifest
+ Raises:
+ RuntimeError: mk does not define LOCAL_PACKAGE_NAME or
+ manifest does not define package variable
+ """
+ module_name = mk.GetVariable(mk.PACKAGE_NAME)
+ if not module_name:
+ raise RuntimeError("Variable %s missing from %s" %
+ (mk.PACKAGE_NAME, mk.FILENAME))
+
+ package_name = manifest.GetPackageName()
+ if not package_name:
+ raise RuntimeError("Variable package missing from %s" % manifest.FILENAME)
+
+
+def main(argv):
+ options, args = _ParseArgs(argv)
+ app_path = args[0];
+
+ if not os.path.exists(app_path):
+ _PrintError("Error: Application path %s not found" % app_path)
+ sys.exit()
+
+ try:
+ mk = android_mk.AndroidMK(app_path=app_path)
+ manifest = android_manifest.AndroidManifest(app_path=app_path)
+ _ValidateInputFiles(mk, manifest)
+
+ module_name = mk.GetVariable(mk.PACKAGE_NAME)
+ _GenerateTestMK(mk)
+ _GenerateTestManifest(manifest, module_name)
+ except Exception, e:
+ _PrintError("Error: %s" % e)
+ _PrintError("Error encountered, script aborted")
+ sys.exit()
+
+ src_path = app_path + "/tests/src"
+ if not os.path.exists(src_path):
+ os.mkdir(src_path)
+
+
+if __name__ == "__main__":
+ main(sys.argv[1:])
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 08afa42..d8c53f6 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -298,11 +298,12 @@
coverage_target="Calendar"
continuous="true" />
+<!-- Make continuous = "true" once the bug 1966269 is fixed -->
<test name="calprov"
build_path="packages/providers/CalendarProvider/tests"
package="com.android.providers.calendar.tests"
coverage_target="CalendarProvider"
- continuous="true" />
+ continuous="false" />
<test name="camerastress"
build_path="packages/apps/Camera"
