Merge "Changes in some of the Android samples to support Google TV"
diff --git a/samples/ActionBarCompat/AndroidManifest.xml b/samples/ActionBarCompat/AndroidManifest.xml
index 1a48274..a78339b 100644
--- a/samples/ActionBarCompat/AndroidManifest.xml
+++ b/samples/ActionBarCompat/AndroidManifest.xml
@@ -20,6 +20,8 @@
android:versionName="1.0">
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="14" />
+ <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+ <supports-screens android:largeScreens="true"/>
<application android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
diff --git a/samples/BackupRestore/AndroidManifest.xml b/samples/BackupRestore/AndroidManifest.xml
index af86634..bccd4f7 100644
--- a/samples/BackupRestore/AndroidManifest.xml
+++ b/samples/BackupRestore/AndroidManifest.xml
@@ -26,6 +26,7 @@
<!-- The backup/restore mechanism was introduced in API version 8 -->
<uses-sdk android:minSdkVersion="8"/>
+ <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<application android:label="Backup/Restore"
android:backupAgent="ExampleAgent">
diff --git a/samples/CrossCompatibility/AndroidManifest.xml b/samples/CrossCompatibility/AndroidManifest.xml
index 1097a4d..43eb4ff 100644
--- a/samples/CrossCompatibility/AndroidManifest.xml
+++ b/samples/CrossCompatibility/AndroidManifest.xml
@@ -3,6 +3,11 @@
package="com.example.android.touchexample"
android:versionCode="1"
android:versionName="1.0">
+
+ <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
+ <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+ <supports-screens android:largeScreens="true"/>
+
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".TouchExampleActivity"
android:label="@string/app_name">
@@ -13,5 +18,5 @@
</activity>
</application>
- <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
+
</manifest>
diff --git a/samples/CrossCompatibility/src/com/example/android/touchexample/TouchExample b/samples/CrossCompatibility/src/com/example/android/touchexample/TouchExample
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/samples/CrossCompatibility/src/com/example/android/touchexample/TouchExample
