diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-11-13 14:01:48 -0800 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-11-13 14:02:16 -0800 |
| commit | 7f1698141a1b19453ad2ea5ae5aec74ecd93c7b3 (patch) | |
| tree | be37f9e4ba4ce99a3e66f44eb05f2259bff02e33 /samples/browseable | |
| parent | 1206ee41dcdd9dbd18c77894c366baf9ab73234b (diff) | |
| download | android_development-7f1698141a1b19453ad2ea5ae5aec74ecd93c7b3.tar.gz android_development-7f1698141a1b19453ad2ea5ae5aec74ecd93c7b3.tar.bz2 android_development-7f1698141a1b19453ad2ea5ae5aec74ecd93c7b3.zip | |
DO NOT MERGE: Sync prebuilts for lmp-docs
Synced to lmp-docs commit 73d1988336124ae81421efc4c649960a159bc74d.
Includes ported wear samples from klp-modular-docs commit
72bab108d430916ee901fa21b3b7bc18cfa04a2e. Ported samples include:
- AgendaData
- DataLayer
- DelayedConfirmation
- ElizaChat
- EmbeddedApp
- FindMyPhone
- Flashlight
- Geofencing
- GridViewPager
- JumpingJack
- Notifications
- Quiz
- RecipeAssistant
- SkeletonWearableApp
- SpeedTracker
- SynchronizedNotifications
- Timer
- WatchViewStub
Change-Id: Ie50bde8b5eb801f4249d5beb24896d77e8444aff
Diffstat (limited to 'samples/browseable')
44 files changed, 522 insertions, 42 deletions
diff --git a/samples/browseable/AgendaData/Application/AndroidManifest.xml b/samples/browseable/AgendaData/Application/AndroidManifest.xml index 284e0e69a..be342317c 100644 --- a/samples/browseable/AgendaData/Application/AndroidManifest.xml +++ b/samples/browseable/AgendaData/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.agendadata"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <uses-permission android:name="android.permission.READ_CALENDAR" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> diff --git a/samples/browseable/AgendaData/Application/res/values-v21/template-styles.xml b/samples/browseable/AgendaData/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/AgendaData/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/DataLayer/Application/AndroidManifest.xml b/samples/browseable/DataLayer/Application/AndroidManifest.xml index 821bc116d..787e27361 100644 --- a/samples/browseable/DataLayer/Application/AndroidManifest.xml +++ b/samples/browseable/DataLayer/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.datalayer" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <uses-feature android:name="android.hardware.camera" android:required="false" /> diff --git a/samples/browseable/DataLayer/Application/res/values-v21/template-styles.xml b/samples/browseable/DataLayer/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/DataLayer/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/DelayedConfirmation/Application/AndroidManifest.xml b/samples/browseable/DelayedConfirmation/Application/AndroidManifest.xml index 20b7aab82..3fa1f36fc 100644 --- a/samples/browseable/DelayedConfirmation/Application/AndroidManifest.xml +++ b/samples/browseable/DelayedConfirmation/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.delayedconfirmation" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" diff --git a/samples/browseable/DelayedConfirmation/Application/res/values-v21/template-styles.xml b/samples/browseable/DelayedConfirmation/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/DelayedConfirmation/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/ElizaChat/Application/AndroidManifest.xml b/samples/browseable/ElizaChat/Application/AndroidManifest.xml index 98d4d73de..14e982383 100644 --- a/samples/browseable/ElizaChat/Application/AndroidManifest.xml +++ b/samples/browseable/ElizaChat/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.elizachat" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" diff --git a/samples/browseable/ElizaChat/Application/res/values-v21/template-styles.xml b/samples/browseable/ElizaChat/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/ElizaChat/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/ElizaChat/Shared/AndroidManifest.xml b/samples/browseable/ElizaChat/Shared/AndroidManifest.xml new file mode 100644 index 000000000..dfbb0927d --- /dev/null +++ b/samples/browseable/ElizaChat/Shared/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2013 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.example.android.wearable.elizachat.common"> + + <application android:allowBackup="true" + android:label="@string/app_name"> + </application> + +</manifest> diff --git a/samples/browseable/ElizaChat/Shared/res/values/strings.xml b/samples/browseable/ElizaChat/Shared/res/values/strings.xml new file mode 100644 index 000000000..0f2bb9075 --- /dev/null +++ b/samples/browseable/ElizaChat/Shared/res/values/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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> + <string name="app_name">Shared</string> +</resources> diff --git a/samples/browseable/EmbeddedApp/Application/AndroidManifest.xml b/samples/browseable/EmbeddedApp/Application/AndroidManifest.xml index eb2e01c28..ee47ffeda 100644 --- a/samples/browseable/EmbeddedApp/Application/AndroidManifest.xml +++ b/samples/browseable/EmbeddedApp/Application/AndroidManifest.xml @@ -16,7 +16,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.embeddedapp" > - <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" android:icon="@drawable/ic_launcher" diff --git a/samples/browseable/EmbeddedApp/Application/res/values-v21/template-styles.xml b/samples/browseable/EmbeddedApp/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/EmbeddedApp/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/FindMyPhone/Application/AndroidManifest.xml b/samples/browseable/FindMyPhone/Application/AndroidManifest.xml index 04270254c..e88a04669 100644 --- a/samples/browseable/FindMyPhone/Application/AndroidManifest.xml +++ b/samples/browseable/FindMyPhone/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.findphone"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <uses-permission android:name="android.permission.VIBRATE" /> <application diff --git a/samples/browseable/FindMyPhone/Application/res/values-v21/template-styles.xml b/samples/browseable/FindMyPhone/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/FindMyPhone/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/Flashlight/Application/AndroidManifest.xml b/samples/browseable/Flashlight/Application/AndroidManifest.xml index 73d1d52ca..44cfdd3c4 100644 --- a/samples/browseable/Flashlight/Application/AndroidManifest.xml +++ b/samples/browseable/Flashlight/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.flashlight"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" android:label="@string/app_name"> diff --git a/samples/browseable/Flashlight/Application/res/values-v21/template-styles.xml b/samples/browseable/Flashlight/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/Flashlight/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/Geofencing/Application/AndroidManifest.xml b/samples/browseable/Geofencing/Application/AndroidManifest.xml index b5b57f6a3..ba978157d 100644 --- a/samples/browseable/Geofencing/Application/AndroidManifest.xml +++ b/samples/browseable/Geofencing/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.geofencing"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> diff --git a/samples/browseable/Geofencing/Application/res/values-v21/template-styles.xml b/samples/browseable/Geofencing/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/Geofencing/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/GridViewPager/Application/AndroidManifest.xml b/samples/browseable/GridViewPager/Application/AndroidManifest.xml index add48f1f5..57241ce3c 100644 --- a/samples/browseable/GridViewPager/Application/AndroidManifest.xml +++ b/samples/browseable/GridViewPager/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.gridviewpager"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" android:label="@string/app_name"> diff --git a/samples/browseable/GridViewPager/Application/res/values-v21/template-styles.xml b/samples/browseable/GridViewPager/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/GridViewPager/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/JumpingJack/Application/AndroidManifest.xml b/samples/browseable/JumpingJack/Application/AndroidManifest.xml index 7610f5953..5e687cb15 100644 --- a/samples/browseable/JumpingJack/Application/AndroidManifest.xml +++ b/samples/browseable/JumpingJack/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.jumpingjack"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <uses-permission android:name="android.permission.VIBRATE"/> <application android:allowBackup="true" diff --git a/samples/browseable/JumpingJack/Application/res/values-v21/template-styles.xml b/samples/browseable/JumpingJack/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/JumpingJack/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml b/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml index 8f7b60a23..6f4f88bac 100644 --- a/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml +++ b/samples/browseable/MessagingService/res/layout-land/fragment_message_me.xml @@ -61,7 +61,6 @@ android:layout_above="@id/clear" android:layout_width="match_parent" android:layout_height="match_parent" - android:maxLines="20" android:scrollbars="vertical"/> </RelativeLayout> </LinearLayout> diff --git a/samples/browseable/MessagingService/res/layout/fragment_message_me.xml b/samples/browseable/MessagingService/res/layout/fragment_message_me.xml index d01c5137a..29a8c441a 100644 --- a/samples/browseable/MessagingService/res/layout/fragment_message_me.xml +++ b/samples/browseable/MessagingService/res/layout/fragment_message_me.xml @@ -47,7 +47,6 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:maxLines="20" android:scrollbars="vertical"/> <Button android:layout_width="match_parent" diff --git a/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java b/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java index 210e061f0..7425df499 100644 --- a/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java +++ b/samples/browseable/MessagingService/src/com.example.android.messagingservice/Conversations.java @@ -45,10 +45,10 @@ public class Conversations { * Senders of the said messages. */ private static final String[] PARTICIPANTS = new String[]{ - "John Rambo", - "Han Solo", - "Rocky Balboa", - "Lara Croft" + "John Smith", + "Robert Lawrence", + "James Smith", + "Jane Doe" }; static class Conversation { diff --git a/samples/browseable/Notifications/Application/AndroidManifest.xml b/samples/browseable/Notifications/Application/AndroidManifest.xml index c7b2da7e5..a0ed72939 100644 --- a/samples/browseable/Notifications/Application/AndroidManifest.xml +++ b/samples/browseable/Notifications/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ package="com.example.android.support.wearable.notifications" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" diff --git a/samples/browseable/Notifications/Application/res/values-v21/template-styles.xml b/samples/browseable/Notifications/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/Notifications/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/Quiz/Application/AndroidManifest.xml b/samples/browseable/Quiz/Application/AndroidManifest.xml index 0d14a71f8..ce7213542 100644 --- a/samples/browseable/Quiz/Application/AndroidManifest.xml +++ b/samples/browseable/Quiz/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.quiz" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" diff --git a/samples/browseable/Quiz/Application/res/values-v21/template-styles.xml b/samples/browseable/Quiz/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/Quiz/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/RecipeAssistant/Application/AndroidManifest.xml b/samples/browseable/RecipeAssistant/Application/AndroidManifest.xml index a9199edb7..3ddff205c 100644 --- a/samples/browseable/RecipeAssistant/Application/AndroidManifest.xml +++ b/samples/browseable/RecipeAssistant/Application/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.recipeassistant" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" diff --git a/samples/browseable/RecipeAssistant/Application/res/values-v21/template-styles.xml b/samples/browseable/RecipeAssistant/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/RecipeAssistant/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/RecipeAssistant/Shared/AndroidManifest.xml b/samples/browseable/RecipeAssistant/Shared/AndroidManifest.xml new file mode 100644 index 000000000..00c86930a --- /dev/null +++ b/samples/browseable/RecipeAssistant/Shared/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2013 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.example.android.wearable.recipeassistant.common"> + + <application android:allowBackup="true" + android:label="@string/app_name"> + </application> + +</manifest> diff --git a/samples/browseable/RecipeAssistant/Shared/res/values/strings.xml b/samples/browseable/RecipeAssistant/Shared/res/values/strings.xml new file mode 100644 index 000000000..0f2bb9075 --- /dev/null +++ b/samples/browseable/RecipeAssistant/Shared/res/values/strings.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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> + <string name="app_name">Shared</string> +</resources> diff --git a/samples/browseable/SkeletonWearableApp/Application/AndroidManifest.xml b/samples/browseable/SkeletonWearableApp/Application/AndroidManifest.xml index 757c92eda..0cbc0370b 100644 --- a/samples/browseable/SkeletonWearableApp/Application/AndroidManifest.xml +++ b/samples/browseable/SkeletonWearableApp/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.google.wearable.app"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" android:label="@string/app_name"> diff --git a/samples/browseable/SkeletonWearableApp/Application/res/values-v21/template-styles.xml b/samples/browseable/SkeletonWearableApp/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/SkeletonWearableApp/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/SpeedTracker/Application/AndroidManifest.xml b/samples/browseable/SpeedTracker/Application/AndroidManifest.xml index 2a6459229..3fb57f7ed 100644 --- a/samples/browseable/SpeedTracker/Application/AndroidManifest.xml +++ b/samples/browseable/SpeedTracker/Application/AndroidManifest.xml @@ -13,7 +13,7 @@ android:glEsVersion="0x00020000" android:required="true"/> <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + android:targetSdkVersion="19" /> <application android:name=".PhoneApplication" diff --git a/samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml b/samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/SpeedTracker/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/SpeedTracker/Wearable/res/layout/main_activity.xml b/samples/browseable/SpeedTracker/Wearable/res/layout/main_activity.xml index 21f809e84..a1b9081a0 100644 --- a/samples/browseable/SpeedTracker/Wearable/res/layout/main_activity.xml +++ b/samples/browseable/SpeedTracker/Wearable/res/layout/main_activity.xml @@ -83,7 +83,7 @@ <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_file_download_grey600_24dp" + android:src="@drawable/ic_gps_not_saving_grey600_96dp" android:id="@+id/saving" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" @@ -98,4 +98,4 @@ android:layout_alignParentRight="true" android:layout_alignBottom="@+id/saving" android:layout_marginRight="60dp"/> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/samples/browseable/SynchronizedNotifications/Application/AndroidManifest.xml b/samples/browseable/SynchronizedNotifications/Application/AndroidManifest.xml index 9d7df72f0..eb6a1495e 100644 --- a/samples/browseable/SynchronizedNotifications/Application/AndroidManifest.xml +++ b/samples/browseable/SynchronizedNotifications/Application/AndroidManifest.xml @@ -22,8 +22,8 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" android:label="@string/app_name" diff --git a/samples/browseable/SynchronizedNotifications/Application/res/values-v21/template-styles.xml b/samples/browseable/SynchronizedNotifications/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/SynchronizedNotifications/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/Timer/Application/AndroidManifest.xml b/samples/browseable/Timer/Application/AndroidManifest.xml index 6b34b1220..bd610eb34 100644 --- a/samples/browseable/Timer/Application/AndroidManifest.xml +++ b/samples/browseable/Timer/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.timer"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" android:label="@string/app_name"> diff --git a/samples/browseable/Timer/Application/res/values-v21/template-styles.xml b/samples/browseable/Timer/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/Timer/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> diff --git a/samples/browseable/WatchViewStub/Application/AndroidManifest.xml b/samples/browseable/WatchViewStub/Application/AndroidManifest.xml index d33b81f9f..e98a62f12 100644 --- a/samples/browseable/WatchViewStub/Application/AndroidManifest.xml +++ b/samples/browseable/WatchViewStub/Application/AndroidManifest.xml @@ -18,8 +18,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.google.wearable.watchviewstub"> - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="20" /> + <uses-sdk android:minSdkVersion="19" + android:targetSdkVersion="19" /> <application android:allowBackup="true" android:label="@string/app_name"> diff --git a/samples/browseable/WatchViewStub/Application/res/values-v21/template-styles.xml b/samples/browseable/WatchViewStub/Application/res/values-v21/template-styles.xml new file mode 100644 index 000000000..134fcd9d3 --- /dev/null +++ b/samples/browseable/WatchViewStub/Application/res/values-v21/template-styles.xml @@ -0,0 +1,22 @@ +<!-- + Copyright 2014 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> + + <!-- Activity themes --> + <style name="Theme.Base" parent="android:Theme.Material.Light" /> + +</resources> |
