am b2c1343d: Merge "Changes in some of the Android samples to support Google TV"

* commit 'b2c1343d418a034309bdd14db16bf669de394c98':
  Changes in some of the Android samples to support Google TV
This commit is contained in:
Trevor Johns
2012-05-01 15:33:10 -07:00
committed by Android Git Automerger
4 changed files with 9 additions and 1 deletions

View File

@@ -20,6 +20,8 @@
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="14" /> <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" <application android:label="@string/app_name"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"

View File

@@ -26,6 +26,7 @@
<!-- The backup/restore mechanism was introduced in API version 8 --> <!-- The backup/restore mechanism was introduced in API version 8 -->
<uses-sdk android:minSdkVersion="8"/> <uses-sdk android:minSdkVersion="8"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<application android:label="Backup/Restore" <application android:label="Backup/Restore"
android:backupAgent="ExampleAgent"> android:backupAgent="ExampleAgent">

View File

@@ -3,6 +3,11 @@
package="com.example.android.touchexample" package="com.example.android.touchexample"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> 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"> <application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".TouchExampleActivity" <activity android:name=".TouchExampleActivity"
android:label="@string/app_name"> android:label="@string/app_name">
@@ -13,5 +18,5 @@
</activity> </activity>
</application> </application>
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
</manifest> </manifest>