LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,142 Commits 2 Branches 0 Tags
11b9213ec5672b5eaf4ea37ef2dd141a8a23a390
Commit Graph

15142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
693140fd56 Fix the eclipse .classpath. 
Many optional modules (development samples, screensavers, AOSP apps)
have been removed since they aren't strictly necessary. They can
always be readded by people who need to develop on them.

Change-Id: I97ca62ae28eb9230f38f567a1ae5fdd06dd04803
 2014-06-24 17:29:23 -07:00
Andy Wickham
967d3f60dd am ad2f26b9: am 11b32f03: Clean up samples (gradle files and Compat stuff in wearable code). 
* commit 'ad2f26b93b53d5e806d619d290bda953dd54b434':
  Clean up samples (gradle files and Compat stuff in wearable code).
 2014-06-24 21:04:50 +00:00
Griff Hazen
6c3cef6e70 am b3ae9165: am 96f19c45: Sample showing how to embed a wearable app into a phone 
* commit 'b3ae91650a49da7453a95ab8c72461d4897c5ccb':
  Sample showing how to embed a wearable app into a phone
 2014-06-24 21:04:48 +00:00
Dan Aminzade
59167edab0 am 2c603516: am 9fd71d61: Add new SynchronizedNotifications sample. 
* commit '2c6035162e1509651871c5d88ff87c434ba6c56e':
  Add new SynchronizedNotifications sample.
 2014-06-24 21:04:47 +00:00
Griff Hazen
0a849fce81 am 246dbde4: am 6cb66cf8: Switch wearable samples to gradle 0.12. 
* commit '246dbde49a20758db0d430a38ee285b332397a38':
  Switch wearable samples to gradle 0.12.
 2014-06-24 21:04:38 +00:00
George Mount
dd27218e5d Use Material theme's default enabling of Activity Transitions. 
Bug 15746767

Change-Id: I88eaeeab5483cc2b82837a2ddca6702ffa25fcd4
 2014-06-24 06:55:58 -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
Xavier Ducrohet
d732021a67 am 3b024f09: Fix packaging of cardview for non-maven extra package. 
* commit '3b024f09a4e7c1bb8a386894de6073e720fed257':
  Fix packaging of cardview for non-maven extra package.
 2014-06-23 19:46:07 +00:00
Xavier Ducrohet
3b024f09a4 Fix packaging of cardview for non-maven extra package. 
bug: 15770129
Change-Id: I26318b11bf0862c0796729740403c3d729e87ef6
 2014-06-23 11:00:37 -07:00
George Mount
c580adec26 Revert "Revert "API Review: Change View viewName attribute to transitionName."" 
This reverts commit f4138cbcfc.

Change-Id: Id5531f7508b22cf0242a5bef063423d932eb104e
 2014-06-23 08:18:46 -07:00
John Reck
da59fc09c9 Merge "Revert "API Review: Change View viewName attribute to transitionName."" 2014-06-23 14:51:00 +00:00
John Reck
f4138cbcfc Revert "API Review: Change View viewName attribute to transitionName." 
This reverts commit 7033a59303.

Change-Id: Ibc8ff91f73b69177ad40890cea36f1b9903e5505
 2014-06-23 14:51:47 +00:00
Ji-Hwan Lee
ad42c9e905 Proper resolution of conflict for 8062092a 
Bug: 15793651
Change-Id: Ib618a9eb179dae3e2284eb8cf19a2b9216345708
 2014-06-23 15:40:08 +09:00
Mark Renouf
73d0a3759a am 2cba0745: Adds a GridViewPager sample wearable app 
* commit '2cba0745a46ee260bfbe303fa89386ab5348604c':
  Adds a GridViewPager sample wearable app
 2014-06-23 03:53:22 +00: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
Xavier Ducrohet
ac21950368 Add more tools to platform-tools 
- etc1tool
- hprof-conv
- dmtracedump

These are platform tools rather than SDK Tools.

Change-Id: I75eb8ea5404ef7ecf7104ecc9129cf439df0e51c
 2014-06-21 14:56:38 -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
Andrew Hsieh
2c3051d762 am c9e0acf2: Merge changes I653740e3,I554024e5 
* commit 'c9e0acf2ac736305a06cbc972c6e22be9be0740c':
  Restore arm's machine/endian.h to be useful for ARMv5
  Hard-float support in android-L/include/math.h
 2014-06-21 04:22:39 +00:00
Andrew Hsieh
d2988ef5b0 am e514118e: Merge "Fix samples for 64-bit ABIs" 
* commit 'e514118e03c861bd678709d7dbf671f879a44da0':
  Fix samples for 64-bit ABIs
 2014-06-21 04:22:38 +00:00
Andrew Hsieh
ea73893074 am 1b587c94: Merge "64-bit in android-L" 
* commit '1b587c943ec9eae4341e2f540611bc32d000e798':
  64-bit in android-L
 2014-06-21 04:22:32 +00:00
Andrew Hsieh
eacb09c3da am 5fcf5cfc: Merge "Refresh 64-bit headers/libs (WW25)" 
* commit '5fcf5cfc02cb36523886c916ff214165def9a5d4':
  Refresh 64-bit headers/libs (WW25)
 2014-06-21 04:21:13 +00:00
George Mount
f4a02fdb95 Merge "API Review: Change View viewName attribute to transitionName." 2014-06-21 03:15:09 +00:00
Ji-Hwan Lee
4f583b9d11 am ad42c9e9: Proper resolution of conflict for 8062092a 
* commit 'ad42c9e905306982a0c38c32088da20e69fa200e':
  Proper resolution of conflict for 8062092a
 2014-06-23 10:33:57 +00:00
Mark Renouf
c788c7955d am 73d0a375: am 2cba0745: Adds a GridViewPager sample wearable app 
* commit '73d0a3759a97d0c242a0448957d344de9c412c47':
  Adds a GridViewPager sample wearable app
 2014-06-23 03:55:06 +00:00
Ji-Hwan Lee
7894d8eeac am 5ece703b: Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp 
* commit '5ece703b190205243f9601a3eddb287ec808a084':
  Fix sdk build, really this time
 2014-06-22 16:49:42 +00:00
Griff Hazen
106d4ca41d am 5da8165a: am 9872c0c7: Move all wearable samples to development/samples/wearable 
* commit '5da8165a4600c62df835e9f59fc61e2d35c7eae4':
  Move all wearable samples to development/samples/wearable
 2014-06-22 09:52:31 +00:00
Griff Hazen
5da8165a46 am 9872c0c7: Move all wearable samples to development/samples/wearable 
* commit '9872c0c7c0383c0d940bab2862c9468af26ee638':
  Move all wearable samples to development/samples/wearable
 2014-06-22 09:02:21 +00:00
Xavier Ducrohet
620a756fcc am ac219503: Add more tools to platform-tools 
* commit 'ac21950368a56dbf1a378211e106d7c54056e4cc':
  Add more tools to platform-tools
 2014-06-21 22:29:31 +00:00
Joe Fernandez
ac4f02d269 am 7b7feee3: am 36a32cd6: resolved conflicts for merge of 9560aaec to klp-modular-dev 
* commit '7b7feee3cbb4a859c87f644e260160902ca52d61':
  Removing old, duplicate developer.android.com server configuration
 2014-06-21 20:19:15 +00:00
Griff Hazen
6d5f06db93 am bd6a37e8: am b6bca953: Add first wearable sample to sdk samples distribution 
* commit 'bd6a37e88f8b32fc3cb62c1ace83aa16546c0981':
  Add first wearable sample to sdk samples distribution
 2014-06-21 20:19:14 +00:00
Griff Hazen
1ad24024b3 am e46688e3: am 2def7d2a: Add first wearable sample to sdk atree 
* commit 'e46688e36ed645036d7283be54a9e7a5da311995':
  Add first wearable sample to sdk atree
 2014-06-21 20:19:13 +00:00
Raphael Moll
270a7b461a am 36f94250: (-s ours) am 3f3f34dc: (-s ours) Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE. 
* commit '36f94250447da75428f409183e9faba2118bd5ae':
  Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
 2014-06-21 20:19:12 +00:00
Raphael Moll
e14e50c346 am 58d9d419: (-s ours) am 71ad7c8f: (-s ours) Fix SDK repo to prevent mixing different targets. DO NOT MERGE. 
* commit '58d9d419eaca2fa15fe6c9411fc7b6da0bdeb118':
  Fix SDK repo to prevent mixing different targets. DO NOT MERGE.
 2014-06-21 20:19:11 +00:00
Raphael Moll
6f11b01396 am fa7e9337: (-s ours) am b706c44a: (-s ours) Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE. 
* commit 'fa7e933739dc47935e087786ffa99754d0ae6d19':
  Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE.
 2014-06-21 20:19:09 +00:00
Raphael Moll
2b3c0c9955 am b2d30f98: (-s ours) am bf5ae628: (-s ours) Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
* commit 'b2d30f98cfa12b17926e9015bfdbb6b2f8c1ddaa':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
 2014-06-21 20:19:08 +00:00
Raphael Moll
2d2c1b6088 am 12eb3224: (-s ours) am efbf1a3e: (-s ours) SDK: support generating repository XML with latest XSD. DO NOT MERGE. 
* commit '12eb322471a92f251f6d02996fbbb2e86d36d569':
  SDK: support generating repository XML with latest XSD. DO NOT MERGE.
 2014-06-21 20:19:07 +00:00
Joe Fernandez
7b7feee3cb am 36a32cd6: resolved conflicts for merge of 9560aaec to klp-modular-dev 
* commit '36a32cd68365b8cefea7669ed925cf5387a3b53a':
  Removing old, duplicate developer.android.com server configuration
 2014-06-21 20:16:33 +00:00
Griff Hazen
bd6a37e88f am b6bca953: Add first wearable sample to sdk samples distribution 
* commit 'b6bca953909d42a6284de4128d767eff8c9862ee':
  Add first wearable sample to sdk samples distribution
 2014-06-21 20:15:51 +00:00
Griff Hazen
e46688e36e am 2def7d2a: Add first wearable sample to sdk atree 
* commit '2def7d2a2a0e9eacf49819c9cba3e5b188b061c3':
  Add first wearable sample to sdk atree
 2014-06-21 20:15:49 +00:00
Raphael Moll
36f9425044 am 3f3f34dc: (-s ours) Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE. 
* commit '3f3f34dc0e2da2330b5bbd7520450247aa31fca6':
  Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
 2014-06-21 20:14:39 +00:00
Raphael Moll
58d9d419ea am 71ad7c8f: (-s ours) Fix SDK repo to prevent mixing different targets. DO NOT MERGE. 
* commit '71ad7c8f4ea7278f48e276c2f232c674b20f7384':
  Fix SDK repo to prevent mixing different targets. DO NOT MERGE.
 2014-06-21 20:14:38 +00:00
Raphael Moll
fa7e933739 am b706c44a: (-s ours) Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE. 
* commit 'b706c44a2b7a600ade941668a50b4039fafa41f0':
  Android USB driver: support 4EE7 (Nexus adb only). DO NOT MERGE.
 2014-06-21 20:14:37 +00:00
Raphael Moll
b2d30f98cf am bf5ae628: (-s ours) Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
* commit 'bf5ae62826d567f0a7c17949138dc55372780c72':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
 2014-06-21 20:14:36 +00:00
Raphael Moll
12eb322471 am efbf1a3e: (-s ours) SDK: support generating repository XML with latest XSD. DO NOT MERGE. 
* commit 'efbf1a3e284f3ede5fc585efcbab8da961d8697b':
  SDK: support generating repository XML with latest XSD. DO NOT MERGE.
 2014-06-21 20:14:35 +00:00
Ed Heyl
ebfd9306c1 am 767f57dc: resolved conflicts for 8062092a 
* commit '767f57dcaf7eedc012981a52f14e0ba7a286587f':
  Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
 2014-06-21 19:53:11 +00:00
Ed Heyl
767f57dcaf resolved conflicts for 8062092a 
Change-Id: Ibbe3d25e62b2c59b4dc89b198915869b61da6bf5
 2014-06-21 12:50:04 -07:00