LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,295 Commits 2 Branches 0 Tags
883b17b351fca5459fdb26f640e411a552dae7d8
Commit Graph

15295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
883b17b351 am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit '5b7f5d2bc428cbd8b2bdbbafa00a57486808d77d':
  Update build-tools revision. DO NOT MERGE.
 2014-10-31 22:04:56 +00:00
Xavier Ducrohet
754cfeb6f7 am 8641d4da: Move mulit-dex files around. 
* commit '8641d4dada2166c116c7663e33f47b297993038e':
  Move mulit-dex files around.
 2014-10-31 22:04:55 +00:00
Xavier Ducrohet
5b7f5d2bc4 Update build-tools revision. DO NOT MERGE. 
Change-Id: I2b59607e7cb24e3c09a2eb430380443d9c3e64d5
 2014-10-31 13:48:51 -07:00
Xavier Ducrohet
8641d4dada Move mulit-dex files around. 
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
 2014-10-31 13:47:47 -07:00
Xavier Ducrohet
25907e2a99 am 8361bb0d: Update build-tools and support for multidex. 
* commit '8361bb0dfa16a3acc7752324e4690598ae0f2320':
  Update build-tools and support for multidex.
 2014-10-29 18:16:09 +00:00
Xavier Ducrohet
8361bb0dfa Update build-tools and support for multidex. 
Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.

Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
 2014-10-29 11:07:40 -07:00
Xavier Ducrohet
9ccbed2191 am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '86d28ad8c192084fea8926a56fec732d99cfcdbc':
  Add jack/jill/multidex lib to build-tools.
 2014-10-28 20:11:55 +00:00
Xavier Ducrohet
86d28ad8c1 Add jack/jill/multidex lib to build-tools. 
Change-Id: Id8aad3a7ea808c5b2d1dd5c008f6202aefb7ef3b
 2014-10-28 12:06:50 -07:00
bohu
ccaaeb5f25 am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit 'c01f2d390fab6f51f1a9619daea6699521e3a679':
  Update system images to revision 3
 2014-10-28 06:31:57 +00:00
bohu
c01f2d390f Merge "Update system images to revision 3" into lmp-dev 2014-10-28 06:27:49 +00:00
Xavier Ducrohet
17d47a1072 am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '5193f245f5096b13c0ce99d1bf4473af1b86c4c8':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-28 06:22:28 +00:00
Takeshi Hagikura
5350100bbd am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit 'f68551537c1011bb537abe0cf7cc817379c043a1':
 2014-10-28 06:22:27 +00:00
Xavier Ducrohet
5193f245f5 Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 2014-10-28 03:11:36 +00:00
Xavier Ducrohet
3ad4b1f733 Update build tools version to 21.1.0. DO NOT MERGE. 
Change-Id: Ib3dc18f67dc26b157747db78f073d892d9a998f3
 2014-10-27 20:10:52 -07:00
Takeshi Hagikura
f68551537c Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 2014-10-28 00:05:42 +00:00
bohu
e66d37aa25 Update system images to revision 3 
Update all the system images to revision 3.

Change-Id: If08e25423fd7680def47102c436162b1e544306f
 2014-10-27 10:57:11 -07:00
Trevor Johns
a916086fe9 am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) 
* commit '5aad4e45d0e6666eec865ac7277406f97da02095':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
 2014-10-24 23:04:42 +00:00
Takeshi Hagikura
156771586a am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev 
* commit '96c8509e4ad462d79f5323619c77b7b7174f4ca5':
  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 23:04:41 +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
a01188985e resolved conflicts for merge of 3bb3da96 to lmp-dev 
Change-Id: I1f96364d78a1e887a96bcb20b84228a83ee0116c
 2014-10-24 15:49:40 +09: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
baf6829eec am f420ff0d: Add browseable samples for Clockwork Beryl 
* commit 'f420ff0d80e9e44e1744602e832d29563d28312d':
  Add browseable samples for Clockwork Beryl
 2014-10-23 07:55:07 +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
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
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
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
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
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
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