Commit Graph

13201 Commits

Author SHA1 Message Date
Naoki Ishihara
a9b5dd3bb3 Add samples to sdk.atree
Change-Id: I34ee63184f2dea6db253bf2ae2b671abb9ab6c4a
2014-09-19 22:17:08 -07: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
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
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
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
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
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
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
Mark Renouf
2cba0745a4 Adds a GridViewPager sample wearable app
Change-Id: I014670493bb54bc1a6e3c1ecda716b9ea8d83412
2014-06-22 21:24:55 -04:00
Griff Hazen
9872c0c7c0 Move all wearable samples to development/samples/wearable
Update build.gradle to compile them all, and remove
gradle stopships.

Copied from vendor/google_clockwork klp-modular-dev as of:
01930cc85bc1ba974a412db7d3c9d17387702e16

Bug: 15591212
Bug: 15264403

Change-Id: I4d05c35c995e675d92039b1dfb2a33e454285af5
2014-06-22 00:18:09 -07:00
Joe Fernandez
36a32cd683 resolved conflicts for merge of 9560aaec to klp-modular-dev
Change-Id: I137c56182c00bca6f427bff5324db765017cf5ec
2014-06-20 22:38:20 -07:00
Joe Fernandez
9560aaec8a am 2f5c9851: Removing old, duplicate developer.android.com server configuration
* commit '2f5c98511397c0528fa710b4603b3322fdc4e7ba':
  Removing old, duplicate developer.android.com server configuration
2014-06-21 02:37:38 +00:00
Griff Hazen
b6bca95390 Add first wearable sample to sdk samples distribution
Wearable samples sometimes have special gradle setups that nest
one application within another. As such, inclusion in the existing
samples generator may be tricky. Instead, just prepare the sample
for direct inclusion into the sdk distribution.

Create a convenience gradle build to build all wearable samples
at once.

Bug: 15591212
Change-Id: I6e03f7c5cc87909430b927aca4b403ded77917ab
2014-06-20 16:31:07 -07:00
Griff Hazen
2def7d2a2a Add first wearable sample to sdk atree
Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
2014-06-20 16:04:46 -07:00
Raphael Moll
3f3f34dc0e Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616

Conflicts:
	build/sdk-android-arm64-v8a.atree
	build/sdk-android-x86.atree
	build/sdk-android-x86_64.atree
	sys-img/images_arm64-v8a_source.prop_template
	sys-img/images_x86_64_source.prop_template
2014-06-20 08:49:37 -07:00
Raphael Moll
71ad7c8f4e Fix SDK repo to prevent mixing different targets. DO NOT MERGE.
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f7)

Change-Id: I8ad6763ace0d6075a743b99fd65a5ae8b69bf3d5
2014-06-20 08:38:23 -07:00
Raphael Moll
b706c44a2b Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE.
Bug: b/14988808

(cherry picked from commit 700c6fd81d)

Change-Id: I222a1858f6e46fa947e5b6ad9c48a7126d66ec70
2014-06-20 08:35:49 -07:00
Raphael Moll
bf5ae62826 Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
(cherry picked from commit 260db8ce43)

Change-Id: I82a07ac7c13f25d14a876017ae47a6c3b765213d
2014-06-20 08:29:45 -07:00
Raphael Moll
efbf1a3e28 SDK: support generating repository XML with latest XSD. DO NOT MERGE.
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

(cherry picked from commit ea40d2f4c5)

Change-Id: Id0363c446014a96a7f78c8e5500fae6092e97dc3
2014-06-20 08:28:25 -07:00
Raphael Moll
8062092a46 Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
Rev 9 adds the Glass PID.

(cherry picked from commit 8221674986)

Change-Id: I63bb199b28c20fa791d3b1f9c70d8ea1633f9a6d
2014-06-20 08:27:28 -07:00
Xavier Ducrohet
f78598f754 Fix repo script to ignore tools. DO NOT MERGE.
(cherry picked from commit d81eb5d833)

Change-Id: I7dbd0db25b84a11c36fcd570935357b0e755555c
2014-06-20 08:24:05 -07:00
smain@google.com
295d21062a add redirects for Edu for FAQ and Guidelines pages
Change-Id: I9865272de026e29a51af84673a82f95565f8395d
2014-06-19 19:18:01 -07:00
Deepanshu Gupta
c91c719f91 am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE]
* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441':
  Package renamed fonts. [DO NOT MERGE]
2014-06-18 00:15:40 +00:00
Deepanshu Gupta
dd2dac3659 am edf631de: Package renamed fonts. [DO NOT MERGE]
* commit 'edf631dee4edd3c44cd4156ccb7974090c89b65d':
  Package renamed fonts. [DO NOT MERGE]
2014-06-18 00:10:42 +00:00