diff options
| author | Jeremy Walker <jewalker@google.com> | 2017-02-01 13:16:40 -0800 |
|---|---|---|
| committer | Jeremy Walker <jewalker@google.com> | 2017-02-06 14:46:44 -0800 |
| commit | a89d0cdbbb5071168ae5bdc1e0e2180167f1f5c5 (patch) | |
| tree | b4d39f3c348e8fb81f062537d40bae409fc9753b /wearable/wear/XYZTouristAttractions | |
| parent | 4088e40d954fb7c1aaf0b76ee6b1093246bf2052 (diff) | |
| download | android-a89d0cdbbb5071168ae5bdc1e0e2180167f1f5c5.tar.gz | |
Part 2 - Updates wear samples for Wear 2.0 launch (fixes minor issues
too from using latest support library) .
Bug: 34789076
Change-Id: Id38df76c9a5028eb1befb2c7a779ebec778d9e06
Diffstat (limited to 'wearable/wear/XYZTouristAttractions')
| -rw-r--r-- | wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | wearable/wear/XYZTouristAttractions/template-params.xml | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml b/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml index fc086da1..320396db 100644 --- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml +++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/AndroidManifest.xml @@ -25,8 +25,8 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" /> <uses-sdk - android:minSdkVersion="21" - android:targetSdkVersion="22" /> + android:minSdkVersion="22" + android:targetSdkVersion="25" /> <application android:allowBackup="true" @@ -34,6 +34,10 @@ android:label="@string/app_name" android:theme="@android:style/Theme.DeviceDefault" > + <meta-data + android:name="com.google.android.wearable.standalone" + android:value="false" /> + <activity android:name=".ui.AttractionsActivity" android:label="@string/app_name" /> diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml index bf2a37db..b6a412ff 100644 --- a/wearable/wear/XYZTouristAttractions/template-params.xml +++ b/wearable/wear/XYZTouristAttractions/template-params.xml @@ -19,8 +19,8 @@ <group>Wearable</group> <package>com.example.android.xyztouristattractions</package> <minSdk>18</minSdk> - <targetSdkVersion>23</targetSdkVersion> - <targetSdkVersionWear>22</targetSdkVersionWear> + <targetSdkVersion>25</targetSdkVersion> + <targetSdkVersionWear>25</targetSdkVersionWear> <wearable> <has_handheld_app>true</has_handheld_app> |