LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,542 Commits 2 Branches 0 Tags
14c5da2f86fd8c59f961e6675eeeb4af299a0e18
Commit Graph

15542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
d155da9790 Add split-select tool to SDK build. 
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
 2014-11-05 11:34:03 -08:00
Jim Miller
d4adb57e07 Update TrustAgentService API after review 
Add test for DPM.setTrustAgentConfiguration()

Also fixes bug where DPM flags were set in onPreferenceChanged()
which happened before being set on the checkbox preference.

Fixes bug 17008504

Change-Id: I165cd73d11c0a68ee6667cb1fd88892a39267903
 2014-11-03 18:48:45 -08:00
Dmitry Shmidt
d00a0a734e Development: Connectivity: Fix receiver leakage 
Bug: 18229332

Change-Id: Iadd8a1a6e72cf762f6494b586b53b827edebd25d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2014-11-03 17:26:00 -08:00
Xavier Ducrohet
66b2f251c7 am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit '883b17b351fca5459fdb26f640e411a552dae7d8':
  Update build-tools revision. DO NOT MERGE.
 2014-11-01 14:09:56 +00:00
Xavier Ducrohet
4aceb7250d am 754cfeb6: am 8641d4da: Move mulit-dex files around. 
* commit '754cfeb6f7baf2e5499959ac439a8a95400a9974':
  Move mulit-dex files around.
 2014-11-01 14:09:55 +00:00
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
Tim Kilbourn
2f6ded27f6 Add secondary text to cards. 
Add some content to PhotoItems so that the ImageCardViews use two lines
of text.

Bug: 18008019
Change-Id: I9bd72f585f76f84df70644b43539210664fbaa0e
 2014-10-29 17:19:04 -07:00
Dake Gu
f66eadb5d4 SupportLeanbackDemo: Add test case for updating overview row 
fixes b/17918639: no back activity transition when overview row updated.
Also hook up the playback actvity.

Change-Id: I52fe3808a1dc614df7d1f33f36de47ce9144e974
 2014-10-29 14:44:50 -07:00
Xavier Ducrohet
0d574614cf am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
  Update build-tools and support for multidex.
 2014-10-29 18:52:23 +00:00
Xavier Ducrohet
e67c313ea0 am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit '9ccbed2191c8b8dcca14e69e93b528c5f675f9c4':
  Add jack/jill/multidex lib to build-tools.
 2014-10-29 18:50:42 +00:00
bohu
5bedd1920b am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit 'ccaaeb5f25aa9023404d4d8dd48f3bcd19291634':
  Update system images to revision 3
 2014-10-29 18:49:24 +00:00
Xavier Ducrohet
1770d4bdca am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '17d47a107210b5e9566cdc2b0b9b177919a59560':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-29 18:49:22 +00:00
Takeshi Hagikura
e38db4c528 am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit '5350100bbdfd1e4aa84c818f728f2d5193a7094f':
 2014-10-29 18:49:21 +00: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
Dake Gu
455a4c3f91 Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 2014-10-28 22:27:57 +00:00
Dake Gu
b43b47c6d3 SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace() 
b/17893479

Change-Id: Iaf91ba1ebca1237fc0d2d5629e0c2e83e15d54a0
 2014-10-28 15:25: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
Adam Lesinski
56fd4241e6 Merge "Enable building gtest for Windows" into lmp-mr1-dev 2014-10-28 17:41:47 +00: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
Dake Gu
d18c4a82e0 Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 2014-10-27 20:36:00 +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
ca4362bc81 am a916086f: am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) 
* commit 'a916086fe96df0e26c7ca364c221b3aaa12f3d69':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
 2014-10-24 23:28:10 +00:00
Takeshi Hagikura
4146542129 am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev 
* commit '156771586a8329c581657c764266a94e4dd47d7f':
  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:28:09 +00: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
Adam Lesinski
42aa7939a6 Enable building gtest for Windows 
Change-Id: Ib4a865ca7716084498eff32e057865c0ffbced46
 2014-10-24 18:40:35 +00:00
Sky Faber
2247b043df DO NOT MERGE: idegen: Skip directories named *.java when parsing source. 
Change-Id: I8a6700ebcc198851b80de4832a43d147dc887f3a
(cherry picked from commit e83d6400fb)
 2014-10-24 18:20:36 +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
7876b306a2 am baf6829e: am f420ff0d: Add browseable samples for Clockwork Beryl 
* commit 'baf6829eecf4889f38fb9d75d1c61392d13b3bd0':
  Add browseable samples for Clockwork Beryl
 2014-10-23 07:58:27 +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
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
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