LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,717 Commits 2 Branches 0 Tags
512358bf8636d90d0b2b3d74cc5640459c23e24c
Commit Graph

15717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
3cbcd20f33 am f43722b7: am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev 
* commit 'f43722b7733243e79149b19a0635af572c79b3e3':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
 2014-10-22 21:44:55 +00:00
Joe Fernandez
35828e85bb am db9b560e: am d74a44da: am de3f94a0: 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- 
* commit 'db9b560e19ec4faee00523b350ee54e798da14df':
  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-22 21:40:50 +00:00
Joe Fernandez
e054c2b35f am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev 
* commit '705a1bb476b9f46a75ae8a90b718f875942364e8':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
 2014-10-22 21:40:49 +00:00
Joe Fernandez
db9b560e19 am d74a44da: am de3f94a0: 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 
* commit 'd74a44da81602b1f36123a37d3b721288afde384':
  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-22 21:34:28 +00:00
Joe Fernandez
705a1bb476 am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev 
* commit 'd42d655323dadec6c846169ea99f4e06ba123495':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
 2014-10-22 21:34:26 +00:00
Joe Fernandez
f43722b773 am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev 
* commit '4a5ce9aedf40ca1de18eafd2e63d31c6d5b63834':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
 2014-10-22 20:34:42 +00:00
Joe Fernandez
d74a44da81 am de3f94a0: 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 
* commit 'de3f94a00075fa1c24ac66db2e8c743bd9f46eed':
  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-22 20:29:19 +00:00
Joe Fernandez
d42d655323 am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev 
* commit 'c789ef844ba501e0d5fc5ae4a429a104541f24ff':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
 2014-10-22 20:29:17 +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
Yigit Boyar
6b04206cda am c30782ed: am bbc4455b: Merge "Add color picker to cardview demo" into lmp-mr1-dev 
* commit 'c30782edb29245c24dac98a6a0c54e7f29d2023a':
  Add color picker to cardview demo
 2014-10-22 15:34:44 +00:00
Xavier Ducrohet
1c1b66af29 am 12bc49de: am af87a11e: am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 
* commit '12bc49de3357d8eb734f94ee685a504014954a2d':
  Update Build Tools version to <API>.0.2. DO NOT MERGE.
 2014-10-22 15:34:01 +00:00
Yigit Boyar
c30782edb2 am bbc4455b: Merge "Add color picker to cardview demo" into lmp-mr1-dev 
* commit 'bbc4455be0a57658475828c452ee8eda29aa8b51':
  Add color picker to cardview demo
 2014-10-22 15:21:43 +00:00
Yigit Boyar
bbc4455be0 Merge "Add color picker to cardview demo" into lmp-mr1-dev 2014-10-22 15:16:40 +00:00
Xavier Ducrohet
12bc49de33 am af87a11e: am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 
* commit 'af87a11e4c3fd13bfd8bf7597b2338a8c4d067af':
  Update Build Tools version to <API>.0.2. DO NOT MERGE.
 2014-10-22 14:57:59 +00:00
Xavier Ducrohet
af87a11e4c am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 
* commit '56be755b584fe30880dec69d654137549c03b241':
  Update Build Tools version to <API>.0.2. DO NOT MERGE.
 2014-10-22 14:53:14 +00: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
56be755b58 am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 
* commit '0a871db0aaf6891fd82afedfeb7dbb94473cd39c':
  Update Build Tools version to <API>.0.2. DO NOT MERGE.
 2014-10-21 16:25:11 +00: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
cad4d4b97a am 46d5f2f0: am c29dc0d2: am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit '46d5f2f08aad4799e5a0e6540189fcd2b31be689':
  Modify testrunner/test_defs.xml to delete obsolete cts tests
 2014-10-20 20:21:24 +00:00
Chenjie Luo
46d5f2f08a am c29dc0d2: am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit 'c29dc0d2609830eb7ea59741c1d63cad4345227f':
  Modify testrunner/test_defs.xml to delete obsolete cts tests
 2014-10-20 20:16:39 +00:00
Chenjie Luo
c29dc0d260 am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit '86f364c8f438b06340bd6a42cf8340d24b5dc813':
  Modify testrunner/test_defs.xml to delete obsolete cts tests
 2014-10-20 20:12:44 +00:00
Chenjie Luo
86f364c8f4 am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit '3b0ab876fabd488e71c01092810f622508a77d22':
  Modify testrunner/test_defs.xml to delete obsolete cts tests
 2014-10-20 20:08:42 +00: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
9340911fdd am 80eb5b30: (-s ours) am 804aad73: (-s ours) am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '80eb5b301b865d72da5b061b92e109248d2e1727':
  Import translations. DO NOT MERGE
 2014-10-20 00:40:38 +00:00
Baligh Uddin
80eb5b301b am 804aad73: (-s ours) am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '804aad7383e8ee592048e1bb227ef483b1ba70c7':
  Import translations. DO NOT MERGE
 2014-10-20 00:35:22 +00:00
Baligh Uddin
804aad7383 am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6ca01465a7b2a0b293756243388cff2a1bb0a5bb':
  Import translations. DO NOT MERGE
 2014-10-20 00:30:13 +00:00
Baligh Uddin
6ca01465a7 am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3a39d4e245e39dc0cfad953ef38a11035e69a6c9':
  Import translations. DO NOT MERGE
 2014-10-20 00:24:57 +00: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
dc4b7e3dc0 am 3afda098: (-s ours) am bb11b4a9: (-s ours) am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit '3afda098e1f47d3b6225086ed9add32bc8bfd819':
  Import translations. DO NOT MERGE
 2014-10-19 17:11:25 +00:00
Baligh Uddin
3afda098e1 am bb11b4a9: (-s ours) am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb11b4a90a394a7c67fec2a687ab248b5bcc518b':
  Import translations. DO NOT MERGE
 2014-10-19 17:06:49 +00:00
Baligh Uddin
bb11b4a90a am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit '568808dd397b8951ad5b525b5ad7f4471f47c4eb':
  Import translations. DO NOT MERGE
 2014-10-19 17:01:27 +00:00
Baligh Uddin
568808dd39 am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit '0a77b1e924a62097723f4ebe862fa4274c9fa7fe':
  Import translations. DO NOT MERGE
 2014-10-19 16:56:39 +00: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
9756546087 am 297089b1: am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE. 
* commit '297089b18ed58c1b297767256b9d2a15d370b51f':
  Update Build Tools version to <API>.0.1. DO NOT MERGE.
 2014-10-17 23:12:30 +00:00
Xavier Ducrohet
297089b18e am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE. 
* commit '946bfb51c0c4e47c9d111ada1fddf050e2823609':
  Update Build Tools version to <API>.0.1. DO NOT MERGE.
 2014-10-17 23:01:45 +00: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
4b16c84fb0 am c60b2dd6: am 36274ac5: Add additional samples for L to sdk.atree 
* commit 'c60b2dd6b5982029b7115da777a1e1eefb2bab53':
  Add additional samples for L to sdk.atree
 2014-10-17 20:28:51 +00: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
c60b2dd6b5 am 36274ac5: Add additional samples for L to sdk.atree 
* commit '36274ac53dfcef9661c5215e9fabf7a6501e0c64':
  Add additional samples for L to sdk.atree
 2014-10-17 19:56:44 +00:00
Trevor Johns
34ebd03fbc am 4b5d8355: am 6876a9cf: Add browseable samples for L SDK release 
* commit '4b5d8355cb61a6420d6a218396650e7b4c4ac88b':
  Add browseable samples for L SDK release
 2014-10-17 19:17:20 +00:00
Trevor Johns
84f0d412b6 am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev 
* commit '4e09738a8684cf2ba5ed111764d7804ada2a4298':
  Update sdk.atree and samples_source.prop_template for L SDK release
 2014-10-17 19:17:17 +00:00
Trevor Johns
339006dcbd am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample 
* commit '72687bd8a7d3629b2ceb3a9fa1cefcd4bbdf4d66':
  sdk.atree: Fix typo and remove legacy BluetoothChat sample
 2014-10-17 19:17:11 +00:00