Merge "Removed _index.jd files (should be generated). Also removed previous jd files." into developers-dev
diff --git a/background/alarms/repeatingAlarm/template-params.xml b/background/alarms/repeatingAlarm/template-params.xml
index fdb96ba..b5a52bb 100644
--- a/background/alarms/repeatingAlarm/template-params.xml
+++ b/background/alarms/repeatingAlarm/template-params.xml
@@ -16,6 +16,7 @@
-->
<sample>
<name>repeatingAlarm</name>
+ <group>Background</group>
<package>com.example.android.repeatingalarm</package>
diff --git a/connectivity/bluetooth/BluetoothLeGatt/template-params.xml b/connectivity/bluetooth/BluetoothLeGatt/template-params.xml
index 9fa7737..323e1d7 100644
--- a/connectivity/bluetooth/BluetoothLeGatt/template-params.xml
+++ b/connectivity/bluetooth/BluetoothLeGatt/template-params.xml
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BluetoothLeGatt</name>
<group>Connectivity</group>
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml b/connectivity/network/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml
index 87b785f..293c16b 100644
--- a/connectivity/network/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml
+++ b/connectivity/network/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicnetworking.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicnetworking"
+ android:label="Tests for com.example.android.basicnetworking" />
</manifest>
\ No newline at end of file
diff --git a/connectivity/network/BasicNetworking/template-params.xml b/connectivity/network/BasicNetworking/template-params.xml
index 7ba0747..3413740 100644
--- a/connectivity/network/BasicNetworking/template-params.xml
+++ b/connectivity/network/BasicNetworking/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicNetworking</name>
- <group>NoGroup</group>
+ <group>Connectivity</group>
<package>com.example.android.basicnetworking</package>
<!-- change minSdk if needed-->
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml b/connectivity/network/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml
index 87b785f..80fec80 100644
--- a/connectivity/network/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml
+++ b/connectivity/network/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.networkconnect.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.networkconnect"
+ android:label="Tests for com.example.android.networkconnect" />
</manifest>
\ No newline at end of file
diff --git a/connectivity/network/NetworkConnect/template-params.xml b/connectivity/network/NetworkConnect/template-params.xml
index 82617f8..a1d5991 100644
--- a/connectivity/network/NetworkConnect/template-params.xml
+++ b/connectivity/network/NetworkConnect/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>NetworkConnect</name>
- <group>NoGroup</group>
+ <group>Connectivity</group>
<package>com.example.android.networkconnect</package>
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml
index 87b785f..44c910a 100644
--- a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml
+++ b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicsyncadapter.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicsyncadapter"
+ android:label="Tests for com.example.android.basicsyncadapter" />
</manifest>
\ No newline at end of file
diff --git a/connectivity/sync/BasicSyncAdapter/template-params.xml b/connectivity/sync/BasicSyncAdapter/template-params.xml
index ba1feff..7fba138 100644
--- a/connectivity/sync/BasicSyncAdapter/template-params.xml
+++ b/connectivity/sync/BasicSyncAdapter/template-params.xml
@@ -14,11 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicSyncAdapter</name>
+ <group>Connectivity</group>
<package>com.example.android.basicsyncadapter</package>
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml b/content/contacts/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml
index 87b785f..8c4af25 100644
--- a/content/contacts/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml
+++ b/content/contacts/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basiccontactables.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basiccontactables"
+ android:label="Tests for com.example.android.basiccontactables" />
</manifest>
\ No newline at end of file
diff --git a/content/contacts/BasicContactables/template-params.xml b/content/contacts/BasicContactables/template-params.xml
index c3e0ce0..ee2ba11 100644
--- a/content/contacts/BasicContactables/template-params.xml
+++ b/content/contacts/BasicContactables/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicContactables</name>
- <group>NoGroup</group>
+ <group>Content</group>
<package>com.example.android.basiccontactables</package>
diff --git a/content/documentsUi/StorageClient/StorageClientSample/tests/AndroidManifest.xml b/content/documentsUi/StorageClient/StorageClientSample/tests/AndroidManifest.xml
index fc9405b..3f0a38f 100644
--- a/content/documentsUi/StorageClient/StorageClientSample/tests/AndroidManifest.xml
+++ b/content/documentsUi/StorageClient/StorageClientSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.storageclient.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.storageclient"
+ android:label="Tests for com.example.android.storageclient" />
</manifest>
\ No newline at end of file
diff --git a/content/documentsUi/StorageClient/template-params.xml b/content/documentsUi/StorageClient/template-params.xml
index 24bd071..f6843e7 100644
--- a/content/documentsUi/StorageClient/template-params.xml
+++ b/content/documentsUi/StorageClient/template-params.xml
@@ -16,8 +16,8 @@
-->
<sample>
<name>StorageClient</name>
+ <group>Content</group>
<package>com.example.android.storageclient</package>
- <group>NoGroup</group>
<!-- change minSdk if needed-->
<minSdk>4</minSdk>
<compileSdkVersion>19</compileSdkVersion>
diff --git a/content/multiuser/AppRestrictions/template-params.xml b/content/multiuser/AppRestrictions/template-params.xml
index 5fafd3b..fa676b2 100644
--- a/content/multiuser/AppRestrictions/template-params.xml
+++ b/content/multiuser/AppRestrictions/template-params.xml
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>AppRestrictions</name>
<group>Content</group>
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml b/input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml
index 87b785f..3c5487c 100644
--- a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml
+++ b/input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicgesturedetect.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicgesturedetect"
+ android:label="Tests for com.example.android.basicgesturedetect" />
</manifest>
\ No newline at end of file
diff --git a/input/gestures/BasicGestureDetect/template-params.xml b/input/gestures/BasicGestureDetect/template-params.xml
index 1feba01..fc8b48d 100644
--- a/input/gestures/BasicGestureDetect/template-params.xml
+++ b/input/gestures/BasicGestureDetect/template-params.xml
@@ -14,11 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicGestureDetect</name>
+ <group>Input</group>
<package>com.example.android.basicgesturedetect</package>
diff --git a/input/multitouch/BasicMultitouch/template-params.xml b/input/multitouch/BasicMultitouch/template-params.xml
index 7bd997f..7677818 100644
--- a/input/multitouch/BasicMultitouch/template-params.xml
+++ b/input/multitouch/BasicMultitouch/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicMultitouch</name>
- <group>NoGroup</group>
+ <group>Input</group>
<package>com.example.android.basicmultitouch</package>
diff --git a/media/BasicMediaDecoder/template-params.xml b/media/BasicMediaDecoder/template-params.xml
index 8d412dc..bcb01af 100644
--- a/media/BasicMediaDecoder/template-params.xml
+++ b/media/BasicMediaDecoder/template-params.xml
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicMediaDecoder</name>
<group>Media</group>
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml b/media/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml
index 87b785f..8800232 100644
--- a/media/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml
+++ b/media/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicmediarouter.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicmediarouter"
+ android:label="Tests for com.example.android.basicmediarouter" />
</manifest>
\ No newline at end of file
diff --git a/media/BasicMediaRouter/template-params.xml b/media/BasicMediaRouter/template-params.xml
index 4d14028..e7cbab5 100644
--- a/media/BasicMediaRouter/template-params.xml
+++ b/media/BasicMediaRouter/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicMediaRouter</name>
- <group>NoGroup</group>
+ <group>Media</group>
<package>com.example.android.basicmediarouter</package>
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml
index 87b785f..eb8b7b8 100644
--- a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml
+++ b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicandroidkeystore.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicandroidkeystore"
+ android:label="Tests for com.example.android.basicandroidkeystore" />
</manifest>
\ No newline at end of file
diff --git a/security/keystore/BasicAndroidKeyStore/template-params.xml b/security/keystore/BasicAndroidKeyStore/template-params.xml
index 2498b88..d603dfa 100644
--- a/security/keystore/BasicAndroidKeyStore/template-params.xml
+++ b/security/keystore/BasicAndroidKeyStore/template-params.xml
@@ -14,11 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicAndroidKeyStore</name>
+ <group>Security</group>
<package>com.example.android.basicandroidkeystore</package>
<!-- change minSdk if needed-->
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml b/testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml
index 87b785f..ad20a2a 100644
--- a/testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml
+++ b/testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.activityinstrumentation.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.activityinstrumentation"
+ android:label="Tests for com.example.android.activityinstrumentation" />
</manifest>
\ No newline at end of file
diff --git a/testing/ActivityInstrumentation/template-params.xml b/testing/ActivityInstrumentation/template-params.xml
index 937e26e..4856a82 100644
--- a/testing/ActivityInstrumentation/template-params.xml
+++ b/testing/ActivityInstrumentation/template-params.xml
@@ -14,11 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>ActivityInstrumentation</name>
+ <group>Testing</group>
<package>com.example.android.com.example.android.activityinstrumentation</package>
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml b/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml
index 87b785f..8dc47be 100644
--- a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml
+++ b/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicaccessibility.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicaccessibility"
+ android:label="Tests for com.example.android.basicaccessibility" />
</manifest>
\ No newline at end of file
diff --git a/ui/accessibility/BasicAccessibility/template-params.xml b/ui/accessibility/BasicAccessibility/template-params.xml
index bc87c3b..af9d815 100644
--- a/ui/accessibility/BasicAccessibility/template-params.xml
+++ b/ui/accessibility/BasicAccessibility/template-params.xml
@@ -14,11 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>BasicAccessibility</name>
+ <group>UI</group>
<package>com.example.android.basicaccessibility</package>
diff --git a/ui/actionbar/DoneBar/DoneBarSample/tests/AndroidManifest.xml b/ui/actionbar/DoneBar/DoneBarSample/tests/AndroidManifest.xml
index 87b785f..40eb5e1 100644
--- a/ui/actionbar/DoneBar/DoneBarSample/tests/AndroidManifest.xml
+++ b/ui/actionbar/DoneBar/DoneBarSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.donebar.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.donebar"
+ android:label="Tests for com.example.android.donebar" />
</manifest>
\ No newline at end of file
diff --git a/ui/actionbar/DoneBar/template-params.xml b/ui/actionbar/DoneBar/template-params.xml
index e343334..c5d1741 100644
--- a/ui/actionbar/DoneBar/template-params.xml
+++ b/ui/actionbar/DoneBar/template-params.xml
@@ -15,8 +15,6 @@
limitations under the License.
-->
-
-
<sample>
<name>DoneBar</name>
<group>UI</group>
diff --git a/ui/actionbarcompat/Basic/BasicSample/tests/AndroidManifest.xml b/ui/actionbarcompat/Basic/BasicSample/tests/AndroidManifest.xml
index 87b785f..a2f7cfc 100644
--- a/ui/actionbarcompat/Basic/BasicSample/tests/AndroidManifest.xml
+++ b/ui/actionbarcompat/Basic/BasicSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.actionbarcompat.basic.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.actionbarcompat.basic"
+ android:label="Tests for com.example.android.actionbarcompat.basic" />
</manifest>
\ No newline at end of file
diff --git a/ui/actionbarcompat/Basic/template-params.xml b/ui/actionbarcompat/Basic/template-params.xml
index da35301..e940d2d 100644
--- a/ui/actionbarcompat/Basic/template-params.xml
+++ b/ui/actionbarcompat/Basic/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>Basic</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.actionbarcompat.basic</package>
<dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/actionbarcompat/ListPopupMenu/ListPopupMenuSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ListPopupMenu/ListPopupMenuSample/tests/AndroidManifest.xml
index 87b785f..d23ab10 100644
--- a/ui/actionbarcompat/ListPopupMenu/ListPopupMenuSample/tests/AndroidManifest.xml
+++ b/ui/actionbarcompat/ListPopupMenu/ListPopupMenuSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.actionbarcompat.listpopupmenu.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.actionbarcompat.listpopupmenu"
+ android:label="Tests for com.example.android.actionbarcompat.listpopupmenu" />
</manifest>
\ No newline at end of file
diff --git a/ui/actionbarcompat/ListPopupMenu/template-params.xml b/ui/actionbarcompat/ListPopupMenu/template-params.xml
index 4a67f36..0d23829 100644
--- a/ui/actionbarcompat/ListPopupMenu/template-params.xml
+++ b/ui/actionbarcompat/ListPopupMenu/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>ListPopupMenu</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.actionbarcompat.listpopupmenu</package>
<dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/actionbarcompat/ShareActionProvider/ShareActionProviderSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ShareActionProvider/ShareActionProviderSample/tests/AndroidManifest.xml
index 87b785f..c52949c 100644
--- a/ui/actionbarcompat/ShareActionProvider/ShareActionProviderSample/tests/AndroidManifest.xml
+++ b/ui/actionbarcompat/ShareActionProvider/ShareActionProviderSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.actionbarcompat.shareactionprovider.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.actionbarcompat.shareactionprovider"
+ android:label="Tests for com.example.android.actionbarcompat.shareactionprovider" />
</manifest>
\ No newline at end of file
diff --git a/ui/actionbarcompat/ShareActionProvider/template-params.xml b/ui/actionbarcompat/ShareActionProvider/template-params.xml
index 722e830..cf6cb88 100644
--- a/ui/actionbarcompat/ShareActionProvider/template-params.xml
+++ b/ui/actionbarcompat/ShareActionProvider/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>ShareActionProvider</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.actionbarcompat.shareactionprovider</package>
<dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/actionbarcompat/Styled/StyledSample/tests/AndroidManifest.xml b/ui/actionbarcompat/Styled/StyledSample/tests/AndroidManifest.xml
index 87b785f..a990607 100644
--- a/ui/actionbarcompat/Styled/StyledSample/tests/AndroidManifest.xml
+++ b/ui/actionbarcompat/Styled/StyledSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.actionbarcompat.styled.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.actionbarcompat.styled"
+ android:label="Tests for com.example.android.actionbarcompat.styled" />
</manifest>
\ No newline at end of file
diff --git a/ui/actionbarcompat/Styled/template-params.xml b/ui/actionbarcompat/Styled/template-params.xml
index d602051..33577f0 100644
--- a/ui/actionbarcompat/Styled/template-params.xml
+++ b/ui/actionbarcompat/Styled/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>Styled</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.actionbarcompat.styled</package>
<dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/holo/BorderlessButtons/template-params.xml b/ui/holo/BorderlessButtons/template-params.xml
index 555782d..c0d9aeb 100644
--- a/ui/holo/BorderlessButtons/template-params.xml
+++ b/ui/holo/BorderlessButtons/template-params.xml
@@ -14,10 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<sample>
<name>BorderlessButtons</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.borderlessbuttons</package>
<!-- change minSdk if needed-->
diff --git a/ui/lists/CustomChoiceList/template-params.xml b/ui/lists/CustomChoiceList/template-params.xml
index 3275535..b58c0ac 100644
--- a/ui/lists/CustomChoiceList/template-params.xml
+++ b/ui/lists/CustomChoiceList/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>CustomChoiceList</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.customchoicelist</package>
<!-- change minSdk if needed-->
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml b/ui/notifications/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml
index 87b785f..62c01e8 100644
--- a/ui/notifications/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml
+++ b/ui/notifications/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicnotifications.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicnotifications"
+ android:label="Tests for com.example.android.basicnotifications" />
</manifest>
\ No newline at end of file
diff --git a/ui/notifications/BasicNotifications/template-params.xml b/ui/notifications/BasicNotifications/template-params.xml
index 2d8776f..7118c24 100644
--- a/ui/notifications/BasicNotifications/template-params.xml
+++ b/ui/notifications/BasicNotifications/template-params.xml
@@ -17,9 +17,8 @@
<sample>
<name>BasicNotifications</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.basicnotifications</package>
-
<!-- change minSdk if needed-->
<minSdk>8</minSdk>
diff --git a/ui/notifications/CustomNotifications/template-params.xml b/ui/notifications/CustomNotifications/template-params.xml
index 279522c..ff90ca3 100644
--- a/ui/notifications/CustomNotifications/template-params.xml
+++ b/ui/notifications/CustomNotifications/template-params.xml
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>CustomNotifications</name>
<group>UI</group>
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml b/ui/views/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml
index 87b785f..3f35ede 100644
--- a/ui/views/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml
+++ b/ui/views/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.horizontalpaging.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.horizontalpaging"
+ android:label="Tests for com.example.android.horizontalpaging" />
</manifest>
\ No newline at end of file
diff --git a/ui/views/HorizontalPaging/template-params.xml b/ui/views/HorizontalPaging/template-params.xml
index 28fc0db..e0546b1 100644
--- a/ui/views/HorizontalPaging/template-params.xml
+++ b/ui/views/HorizontalPaging/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>HorizontalPaging</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.horizontalpaging</package>
<!-- change minSdk if needed-->
diff --git a/ui/views/TextSwitcher/template-params.xml b/ui/views/TextSwitcher/template-params.xml
index dffc256..365c708 100644
--- a/ui/views/TextSwitcher/template-params.xml
+++ b/ui/views/TextSwitcher/template-params.xml
@@ -14,12 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
<sample>
<name>TextSwitcher</name>
- <group>NoGroup</group>
+ <group>UI</group>
<package>com.example.android.textswitcher</package>
<!-- change minSdk if needed-->
diff --git a/ui/window/AdvancedImmersiveMode/template-params.xml b/ui/window/AdvancedImmersiveMode/template-params.xml
index 3ae1faa..0f23700 100644
--- a/ui/window/AdvancedImmersiveMode/template-params.xml
+++ b/ui/window/AdvancedImmersiveMode/template-params.xml
@@ -16,8 +16,8 @@
-->
<sample>
<name>AdvancedImmersiveMode</name>
- <package>com.example.android.advancedimmersivemode</package>
<group>UI</group>
+ <package>com.example.android.advancedimmersivemode</package>
<!-- change minSdk if needed-->
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
index fc9405b..070368c 100644
--- a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
+++ b/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.basicimmersivemode.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.basicimmersivemode"
+ android:label="Tests for com.example.android.basicimmersivemode" />
</manifest>
\ No newline at end of file
diff --git a/ui/window/BasicImmersiveMode/template-params.xml b/ui/window/BasicImmersiveMode/template-params.xml
index 5c7b73c..1335908 100644
--- a/ui/window/BasicImmersiveMode/template-params.xml
+++ b/ui/window/BasicImmersiveMode/template-params.xml
@@ -16,8 +16,8 @@
-->
<sample>
<name>BasicImmersiveMode</name>
- <package>com.example.android.basicimmersivemode</package>
<group>UI</group>
+ <package>com.example.android.basicimmersivemode</package>
diff --git a/ui/window/ImmersiveMode/template-params.xml b/ui/window/ImmersiveMode/template-params.xml
index 88d3136..e053d26 100644
--- a/ui/window/ImmersiveMode/template-params.xml
+++ b/ui/window/ImmersiveMode/template-params.xml
@@ -18,6 +18,7 @@
<name>ImmersiveMode</name>
<group>UI</group>
<package>com.example.android.immersivemode</package>
+
<compileSdkVersion>19</compileSdkVersion>
<!--TODO: change minSdk if needed-->
diff --git a/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml b/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml
index 87b785f..e368f05 100644
--- a/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml
+++ b/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="${sample.package}.tests"
+ package="com.example.android.textlinkify.tests"
android:versionCode="1"
android:versionName="1.0">
@@ -36,7 +36,7 @@
-->
<instrumentation
android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="${sample.package}"
- android:label="Tests for ${sample.package}" />
+ android:targetPackage="com.example.android.textlinkify"
+ android:label="Tests for com.example.android.textlinkify" />
</manifest>
\ No newline at end of file