Commit Graph

15313 Commits

Author SHA1 Message Date
Elliott Hughes
d03c4985e7 Merge "Turning stack_core into a class to make it compatible with adbs." 2014-07-01 14:58:13 +00:00
Brigid Smith
ea0a835d4d Turning stack_core into a class to make it compatible with adbs.
This includes the fairly large change of refactoring stack_core.py into
a class so that its behavior is compatible with adbs.  Additionally, if
the ABI line does not come before lines that require it to determine
proper widths (registers, stack), then it will assume that the ABI is
32 bit and not 64.

Change-Id: I6ad84a55337d86d25f7f8197048dc93868b0a01a
2014-07-01 11:25:44 -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
Baligh Uddin
6f5610e8f4 Import translations. DO NOT MERGE
Change-Id: I29a847229dc5048e6311586c837e49b8f77f8535
Auto-generated-cl: translation import
2014-06-30 14:44:01 +00:00
Baligh Uddin
69e8ec843f Import translations. DO NOT MERGE
Change-Id: I35f8c3b1e41ef00e29a5e5c85ee9f5a490fd22d8
Auto-generated-cl: translation import
2014-06-30 01:59:22 -07:00
Tony Wickham
96460182ce am 8be07748: Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev
* commit '8be07748c053ab5e883a22e6cb0663cb5747ca05':
  Timer sample app now uses Set a timer voice command instead of Set alarm.
2014-06-27 17:59:07 +00:00
George Mount
f45c4509fb Merge "Use ChangeImageTransform instead of MoveImage." 2014-06-27 16:52:20 +00: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
Craig Stout
41b9d5ca03 Merge "Add BrowseErrorActivity and ErrorFragment." 2014-06-26 18:07:29 +00:00
Craig Stout
c2a7292e51 Add BrowseErrorActivity and ErrorFragment.
Change-Id: I60cb6f436782d3b8a97c2f48a71e2ee86ef6d542
2014-06-27 11:54:38 -07:00
Tony Wickham
2951b98d3c am 96460182: am 8be07748: Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev
* commit '96460182ced2bcfef58dcb13edf1241b7ac7068e':
  Timer sample app now uses Set a timer voice command instead of Set alarm.
2014-06-27 18:05:30 +00:00
Adam Lesinski
a75e45ab61 Merge "Fix incorrect external resource creation" 2014-06-26 05:59:24 +00:00
George Mount
87917e8684 Use ChangeImageTransform instead of MoveImage.
Bug 15744992

Change-Id: I76625601e576cbf8c5d44239749d28984fcea6eb
2014-06-25 13:28:16 -07:00
George Mount
60d8cebd04 Merge "Use Material theme's default enabling of Activity Transitions." 2014-06-25 17:34:02 +00:00
Andrew Hsieh
ed7eb1300d Remove symlink lib-boostrap
next CL will populate mips64r6 lib and lib-boostrap in real directory
previous symlink to android-9/arch-mips which is mips64r2

Change-Id: I59baeb4e5b6f32e0c52c6a0d1a54985808f0534f
2014-06-24 20:40:05 -07: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
ad2f26b93b am 11b32f03: Clean up samples (gradle files and Compat stuff in wearable code).
* commit '11b32f038486390d91aafb56c6204666267db89f':
  Clean up samples (gradle files and Compat stuff in wearable code).
2014-06-24 21:00:23 +00:00
Griff Hazen
b3ae91650a am 96f19c45: Sample showing how to embed a wearable app into a phone
* commit '96f19c456f3eafea5ab267b13dfceae1c75964eb':
  Sample showing how to embed a wearable app into a phone
2014-06-24 21:00:20 +00:00
Dan Aminzade
2c6035162e am 9fd71d61: Add new SynchronizedNotifications sample.
* commit '9fd71d61f262bfe238b58c60fab6e6494b028356':
  Add new SynchronizedNotifications sample.
2014-06-24 21:00:19 +00:00
Griff Hazen
246dbde49a am 6cb66cf8: Switch wearable samples to gradle 0.12.
* commit '6cb66cf80e3ab19f37efd8f35eb5a1debebc7d68':
  Switch wearable samples to gradle 0.12.
2014-06-24 21:00:11 +00:00
Jeff Davidson
7767d3fc0f Merge "Fix the eclipse .classpath." 2014-06-24 17:32:43 +00:00
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