Deepanshu Gupta
591f5c8b14
am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '1fa56befffded934f1101760a279b2ff8e55f655':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:20:17 +00:00
Deepanshu Gupta
1fa56befff
am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '3271adb9958beaf3d9651d6a6e1406731d12306f':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:15:20 +00:00
Deepanshu Gupta
3271adb995
am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '1b0b90c5b3a277c2d3c798232beab4776253e2fe':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:10:08 +00:00
Deepanshu Gupta
1b0b90c5b3
am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '385f3bb6c4dfd2e630b64c6afdde69507eef5d8c':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:05:34 +00:00
Deepanshu Gupta
2533746207
am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'ab4bad872a7a03e3ab4164252942fa227ca4f1cc':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:02:32 +00:00
Deepanshu Gupta
ab4bad872a
am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '8a4e0831b1144b9d809306c56a0bd387342dcb15':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:57:46 +00:00
Deepanshu Gupta
385f3bb6c4
am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'c5a8318a78f40087ae564753fa57167cbb12af46':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:57:08 +00:00
Deepanshu Gupta
c5a8318a78
am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '5837c832955cfe06cec00d8c1daf2c7effc50b0f':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:53:26 +00:00
Deepanshu Gupta
8a4e0831b1
am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'e377c65b608b096b438b3d4edf71351bf481593a':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:52:54 +00:00
Deepanshu Gupta
e377c65b60
am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'd4402051282b976a1bd40000a61e1bed996c6ea9':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:45:21 +00:00
Deepanshu Gupta
5837c83295
am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'a6da0ee8ca5b1b5ce0a9a4cbd576bcfb5d477516':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:45:21 +00:00
Deepanshu Gupta
a6da0ee8ca
am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:39:30 +00:00
Deepanshu Gupta
d440205128
am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '7f724995d9c4140f6432de4c9bdda8716d8e6059':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:39:27 +00:00
Deepanshu Gupta
82b828e178
Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
2014-07-17 21:09:48 +00:00
Deepanshu Gupta
7ee92e4344
Update platform SDK component to revision 3. [DO NOT MERGE]
...
Also update LayoutLib Api version.
Change-Id: Ic64a548d171891100f043c3e1a823db22b11e71e
2014-07-09 16:59:37 -07:00
Deepanshu Gupta
7f724995d9
Update platform SDK component to revision 3. [DO NOT MERGE]
...
Also update LayoutLib Api version.
Change-Id: Id28d8441dbcf2bbe19c6d11efb0d100c344d558e
2014-07-09 16:57:29 -07:00
Deepanshu Gupta
50cee5e265
Update platform SDK component to revision 2. [DO NOT MERGE]
...
Also update LayoutLib Api version.
Change-Id: I2ceca3d669919ca417b11d4cfb61c35177a46566
2014-07-09 16:55:17 -07:00
Deepanshu Gupta
d6ce63a380
am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '6bd8a043a4c22082fb8bcc75806f3b28009f3c51':
2014-07-08 23:54:06 +00:00
Deepanshu Gupta
6bd8a043a4
am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'fdafffee7c167ac08146251a0fda7d869feda56b':
2014-07-08 23:48:54 +00:00
Deepanshu Gupta
fdafffee7c
am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'af01e43fefa45b5bf327128221ca268e6e20a9eb':
2014-07-08 23:44:33 +00:00
Deepanshu Gupta
bc4103e3ab
am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '17bed4f4db4efa9cb8bfbaceb72bf9a7919a5510':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:41:06 +00:00
Deepanshu Gupta
af01e43fef
am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '4564b18ac8b85c4deee7e80b308dc29817515551':
2014-07-08 23:40:06 +00:00
Deepanshu Gupta
17bed4f4db
am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '635276658a37fe0a60380155c50e594447ba7e19':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:37:15 +00:00
Deepanshu Gupta
6aaa1ebb4f
am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '2f5a06e48b130c0ee9bd9d236fe043ef8bd53fe0':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:33:14 +00:00
Deepanshu Gupta
635276658a
am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '8a0254eef573275a234820c6e61526b17dbc77ca':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:32:58 +00:00
Tony Wickham
542963ee68
Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
2014-07-08 23:31:34 +00:00
Tony Wickham
ab63d27944
Added _index.html and screenshots to all samples.
...
Bug 15814554
Change-Id: Icdb08c5cc39f97c88674e4177b88b47adce59127
2014-07-08 19:48:23 -07:00
Deepanshu Gupta
fc3efcd286
am d6ce63a3: am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'd6ce63a380e611719bbb817f0edd5433f3bbc483':
2014-07-08 23:58:18 +00:00
Deepanshu Gupta
e851bb15ff
am bc4103e3: am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'bc4103e3abcef871ca3677364827ca561fce7685':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:46:00 +00:00
Deepanshu Gupta
6721a87704
am 6aaa1ebb: am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '6aaa1ebb4f0416f5cf7899b658c691965429ede8':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:38:18 +00:00
Deepanshu Gupta
4564b18ac8
am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '64d3ef3b0294be71cb05af07f5691166fa804cc1':
2014-07-08 23:30:11 +00:00
Deepanshu Gupta
2f5a06e48b
am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '1066b88723caa9b4e7bcca44028c578bc25849c0':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:28:38 +00:00
Deepanshu Gupta
8a0254eef5
am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '618ccb2b061d9c6caeaea879d889e4a709a5a470':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:28:17 +00:00
Deepanshu Gupta
64d3ef3b02
am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'e61fde7faeeffbecb216f698fb156666bf071267':
2014-07-08 23:26:16 +00:00
Deepanshu Gupta
1066b88723
am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '7ad693d1d8180ce3650bb2a80c15d5f4ec853311':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:23:55 +00:00
Deepanshu Gupta
618ccb2b06
am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '2277921695e1b9d396c1daec877c2ec2c142476e':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:23:32 +00:00
Deepanshu Gupta
e61fde7fae
am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'bbfcdcc45ab63cdf22be404c89fbe0964191bd5b':
2014-07-08 23:21:35 +00:00
Deepanshu Gupta
7ad693d1d8
am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '35feaff4962ef76c8cc1a1d79350804715f7f3d0':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:19:48 +00:00
Deepanshu Gupta
2277921695
am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '95ad5e383986b294b388507a28fff09d24aab0a3':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:19:38 +00:00
Deepanshu Gupta
bbfcdcc45a
am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '36b225169ab4ac6bcd59e685517fdc4bc2e8b420':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:17:24 +00:00
Deepanshu Gupta
95ad5e3839
am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '36b225169ab4ac6bcd59e685517fdc4bc2e8b420':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:17:11 +00:00
Andy Wickham
ea56da7073
Use WearableListView in Timer sample app.
...
Bug: 15864517
Change-Id: Ia56111457c2d74571e69a5a554d5755bb1c1b220
2014-07-02 20:45:22 -07:00
Andy Wickham
50532de03f
Add AOSP Copyright header to samples.
...
Bug: 16039713
Change-Id: I0aead1428c7c6a100214dabb85dbf357e37fcfc8
2014-07-02 14:23:37 -07:00
Andy Wickham
5fa0a4c90d
Make connected watches show as compatible with Wearable samples.
...
Bug: 15840402
Change-Id: I805153643b8c307eab9b2c2cf278042b968c16af
2014-06-30 16:48:26 -07:00
Tony Wickham
8be07748c0
Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev
2014-06-26 18:34:16 +00:00
Tony Wickham
2184712510
Timer sample app now uses Set a timer voice command instead of Set alarm.
...
Change-Id: I1904d3b164d06d987eca0568b9c22a2ae36c8563
2014-06-24 17:40:30 -07:00
Andy Wickham
11b32f0384
Clean up samples (gradle files and Compat stuff in wearable code).
...
- Remove -v13 and -v4 dependencies on wearable side
- Verify phone is set to compile on API 19 and wearable on 20
- Replace NotificationCompat in wearable side since it uses API 20
- Move ElizaChat code to Application directory
Bug: 15809453
Change-Id: Ib75e7894505f82e5b4d8591b4dfa91a3de8e0329
2014-06-23 19:15:26 -07:00
Griff Hazen
96f19c456f
Sample showing how to embed a wearable app into a phone
...
With a keystore present.
Change-Id: I3693f8c4b7ff09fe2fc3023bfe561b929333b8a4
2014-06-23 15:36:51 -07:00
Dan Aminzade
9fd71d61f2
Add new SynchronizedNotifications sample.
...
This sample demonstrates how to use DataItems to construct linked
phone- and wearable-side notifications.
Change-Id: I6defa7fad671ba2ec0de25c8913abd66d07846a2
2014-06-23 15:32:56 -07:00
Griff Hazen
6cb66cf80e
Switch wearable samples to gradle 0.12.
...
And remove unnecessary lint warning skips and noCompress 'apk'
Bug: 15827591
Change-Id: I862fa7188277ac7de0dca22ecf0d9129ca941ee5
2014-06-23 14:41:03 -07:00
