LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,277 Commits 2 Branches 0 Tags
1206ee41dcdd9dbd18c77894c366baf9ab73234b
Commit Graph

15277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
1206ee41dc DO NOT MERGE: Sync browseable samples for wear 
Synced to commit 8d594385273af9656bf145a4f85e1d73c4ed8c69 in
klp-modular-docs.

Includes samples:
- AgendaData
- DataLayer
- DelayedConfirmation
- ElizaChat
- EmbeddedApp
- FindMyPhone
- Flashlight
- Geofencing
- GridViewPager
- JumpingJack
- Notifications
- Quiz
- RecipeAssistant
- SkeletonWearableApp
- SpeedTracker
- SynchronizedNotifications
- Timer
- WatchViewStub

Change-Id: I984fab316202749844e791f0c7a1c98bb6a5e524
 2014-11-12 19:13:09 -08:00
Trevor Johns
c6b0eb1ac1 Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs 2014-11-13 02:41:56 +00:00
Trevor Johns
b124012eac Revert "sdk.atree: Disable Wear samples for lmp branches" 
This reverts commit fcd28181a1.

Change-Id: I9e76020676b194917f98c5f8c4ce8c6d6fe6cf5e
 2014-11-13 02:41:48 +00:00
Trevor Johns
3081f16cd6 Sync browseable samples for lmp-docs 
Syncing to commit 0afa2a3366307b12a213a199be1eb8baac1c5f1c.

Change-Id: I6ab153008951bb7e06001c0f27f44df4e4f6cb83
 2014-11-12 18:23:05 -08:00
Trevor Johns
d8c7b24e69 Merge "Update browseable samples for lmp-docs" into lmp-docs 2014-11-12 19:40:55 +00:00
Trevor Johns
527a4f30a6 Update browseable samples for lmp-docs 
Synced to commit df5e5013422b81b4fd05c0ac9fd964b13624847a. Includes
new samples for Android Auto.

Change-Id: I3fec46e2a6b3f196682a92f1afd91eb682dc2dc1
 2014-11-12 11:39:30 -08:00
Trevor Johns
dff4d5d4fd Merge "Add two new samples." into lmp-docs 2014-11-12 19:26:50 +00:00
Renato Mangini
876d208329 Add two new samples. 
Added MessagingServices and MediaBrowserService to sdk build.

Bug: 18323953
Change-Id: I6b2d4caae38a42ec2a6673a5b6c02c7f5a21b868
 2014-11-12 11:21:30 -08:00
Trevor Johns
fcd28181a1 sdk.atree: Disable Wear samples for lmp branches 
Wear samples are currently generated for the klp-modular branch only.

Change-Id: I127a75d171a31f334c5006b6ce251ff1d4f35f42
 2014-11-06 21:11:46 +00:00
Trevor Johns
5aad4e45d0 am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) 
* commit 'bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
 2014-10-24 22:27:48 +00:00
Takeshi Hagikura
96c8509e4a am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev 
* commit '3bb3da96ae60f6e1f1a9fef32c428a92b104c2cd':
  Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)
 2014-10-24 22:14:50 +00:00
Trevor Johns
bd48d1e676 am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) 
* commit '05ef7f04976081f8d2421b579c813c4ade72bbd2':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
 2014-10-24 06:52:13 +00:00
Takeshi Hagikura
3bb3da96ae resolved conflicts for merge of 11e09fc0 to klp-modular-dev 
Extracted the diff for those files between klp-modular-docs and klp-modular-dev in case
https://paste.googleplex.com/5232937083600896

Change-Id: I94950ba66f15b75c1ead60e9f6b38b67e4fa9d6e
 2014-10-24 01:39:19 +00:00
Trevor Johns
f420ff0d80 Add browseable samples for Clockwork Beryl 
Bug: 17473824
Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994
 2014-10-23 03:36:38 +00:00
Joe Fernandez
4a5ce9aedf Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev 2014-10-22 20:28:57 +00:00
Trevor Johns
08e81c8099 DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2) 
Change-Id: Ice64270da1cb79985615623a03a7783a580211ce
 2014-10-22 20:28:48 +00:00
Trevor Johns
05ef7f0497 DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) 
Change-Id: I70b64fc852a9ebd63acd0eca352988f63210b7dd
 2014-10-22 20:28:20 +00:00
Joe Fernandez
de3f94a000 Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)" into lmp-dev 2014-10-22 20:25:18 +00:00
Joe Fernandez
c789ef844b Merge "sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'" into lmp-dev 2014-10-22 20:24:12 +00:00
Takeshi Hagikura
11e09fc057 Deletes the wear samples that have been commited in the wrong place. 
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Conflicts:
	samples/wearable/AgendaData/Application/build.gradle
	samples/wearable/AgendaData/Application/proguard-rules.txt
	samples/wearable/DataLayer/Application/build.gradle
	samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
	samples/wearable/DelayedConfirmation/Application/build.gradle
	samples/wearable/FindMyPhone/Application/build.gradle
	samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml
	samples/wearable/Flashlight/Wearable/proguard-rules.txt
	samples/wearable/Geofencing/Application/build.gradle
	samples/wearable/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
	samples/wearable/Quiz/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java
	samples/wearable/SynchronizedNotifications/Wearable/build.gradle
	samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java

(cherry picked from commit 83642406f8)
Signed-off-by: Trevor Johns <trevorjohns@google.com>

Change-Id: I7107d45d9c54e7d8dc317bd562608d661a8b5284
 2014-10-22 11:20:52 -07:00
Takeshi Hagikura
83642406f8 Deletes the wear samples that have been commited in the wrong place. 
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Change-Id: Icd27de8c7e72ed9508aa1350a0784d627e072154
 2014-10-21 20:24:12 -07:00
Xavier Ducrohet
0a871db0aa Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 2014-10-21 16:21:13 +00:00
Xavier Ducrohet
e07505bf02 Update Build Tools version to <API>.0.2. DO NOT MERGE. 
This for the release that fixes the aapt crash on windows.

Change-Id: I4a8e7d672cf03a48763794c4d559130659d5833b
 2014-10-21 09:18:45 -07:00
Chenjie Luo
3b0ab876fa Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 2014-10-20 20:03:14 +00:00
Chenjie Luo
48ef4ff408 Modify testrunner/test_defs.xml to delete obsolete cts tests 
Bug: 17989468
Change-Id: Ic14603a2b00f35b498ecac3fa4a4f309d29f3408
 2014-10-20 12:13:16 -07:00
Baligh Uddin
3a39d4e245 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-20 00:16:42 +00:00
Baligh Uddin
c6fcd869c6 Import translations. DO NOT MERGE 
Change-Id: I1114bea9e5f859734d8058b7344b9122c8dad7a7
Auto-generated-cl: translation import
 2014-10-19 16:01:45 -07:00
Baligh Uddin
0a77b1e924 Import translations. DO NOT MERGE 
Change-Id: Id9d8758cb68860dad84005bd5a29649b287652ea
Auto-generated-cl: translation import
 2014-10-19 09:47:23 -07:00
Xavier Ducrohet
946bfb51c0 Update Build Tools version to <API>.0.1. DO NOT MERGE. 
This for the release that fixes the aapt crash on windows.

Change-Id: I983a5f084d6786bd0a8c0676b64001d7be6aa3d3
 2014-10-17 15:48:37 -07:00
Trevor Johns
f70fdf3c80 sdk.atree: Move JobScheduler sample from 'ui/views' to 'background' 
Change-Id: Ibecdf48a2977ce52b198d626947ba71eba1ad2b9
 2014-10-17 12:58:03 -07:00
Trevor Johns
36274ac53d Add additional samples for L to sdk.atree 
- RecyclerView
- CardView
- LNotifications
- DrawableTinting
- InterpolatorPlayground
- PdfRendererBasic
- FloatingActionButtonBasic
- RevealEffectBasic

Change-Id: Icea2e207311d60ad72c349c3a6a17439526661af
 2014-10-17 12:05:30 -07:00
Trevor Johns
6876a9cfc5 Add browseable samples for L SDK release 
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508
 2014-10-17 03:31:00 -07:00
Trevor Johns
66b6f721b7 Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev 2014-10-17 00:22:31 +00:00
Trevor Johns
b21dca0c15 Update sdk.atree and samples_source.prop_template for L SDK release 
- Add new samples to sdk.atree
- Bump revision for samples_source.prop_template

Change-Id: I592d2457502dbd2458dec7879c5cea7320743378
 2014-10-16 17:20:10 -07:00
Trevor Johns
ca8bc22a50 sdk.atree: Fix typo and remove legacy BluetoothChat sample 
- Fixed typo: Renamed "MediaEffect" sample to "MediaEffects"
- Removed legacy BluetoothChat sample, since the templatized version
  has now been checked in.

Change-Id: I1b5e48f41a3daa171d70bac765cfba2ece9dd088
 2014-10-16 00:03:51 -07:00
Trevor Johns
d991bed6f1 Resolved conflicts for merge of '9875ec66' into lmp-dev 
Conflicts:
	build/sdk.atree

Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
 2014-10-15 21:16:16 -07:00
Trevor Johns
9875ec66e1 am fb67b1ed: Merge "Add samples to sdk.atree" into klp-modular-docs 
* commit 'fb67b1ed063744889a74e0ff15655affa0bc5c04':
  Add samples to sdk.atree
 2014-10-16 00:29:32 +00:00
Trevor Johns
fb67b1ed06 Merge "Add samples to sdk.atree" into klp-modular-docs 2014-10-16 00:24:55 +00:00
Trevor Johns
569e9febc5 am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '679920d8091c0fb10e68667f158b9e18a77689fa':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 01:24:03 +00:00
Trevor Johns
679920d809 Merge commit '3992ec56' into klp-modular-dev 
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.

Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
 2014-10-08 17:41:47 -07:00
Chenjie Luo
88fbf1fe73 Update test runner for cts tests in testrunner/test_defs.xml 
Bug: 17885115

Change-Id: I2f95d9964bf152fb1b609e0c878eea1cb096f76f
 2014-10-07 15:39:55 -07:00
Tor Norbye
3b2fe7eb9c Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 2014-10-07 01:07:25 +00:00
Deepanshu Gupta
2c34d62a0c Update LayoutLib API level to 12. 
Change-Id: I7e392515939728251424d44d5957f95bdf3eb741
 2014-10-06 16:39:12 -07:00
Tor Norbye
b6b7487e23 Bug 17782530: Annotations using retention policy source remain in .class 
Change-Id: I763e99c243d85406162e3b898fe1e5af8c216173
 2014-10-06 16:21:36 -07:00
Christopher Ferris
bb0d206088 Merge "Do not call art-on macro by default." into lmp-dev 2014-10-05 19:20:06 +00:00
Tor Norbye
0eac39db90 17782530: Annotations using retention policy source remain in .class 
Change-Id: Ia62e0d6ef5024515567be6564197e723f0013ee0
 2014-10-04 18:49:35 +00:00
Christopher Ferris
436b740b70 Do not call art-on macro by default. 
If you are debugging a native process, SIGSEGV gets ignored by default.
The gdbclient bash function has been modified to only call the art-on
macro when running gdbclient app_processXX.

Also, print a warning in case someone is trying to debug a native
process using app_process.

Bug: 17815162
Change-Id: I0666e6713b0a03ee713be7827c5b671938f2c263
 2014-10-03 17:31:41 -07:00
Xavier Ducrohet
3c0cd8cf15 Merge "Package libc++.so in the build-tools." into lmp-dev 2014-10-03 19:37:24 +00:00
Trevor Johns
3992ec5675 Update sdk_repo samples 20 from 1 to 2 
DO NOT MERGE

Change-Id: Ia9d89a28991fc1ac4d81e18fe596bc793e54353c
 2014-10-02 18:36:43 -07:00
Ruben Brunk
e5aa0f3fa8 runtest: Remove unused CtsTestStubs dependency. 
Change-Id: Icee3004731ab5d37e8eb2caba76b19b0a5f1b1b7
 2014-10-02 13:08:24 -07:00