LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,558 Commits 2 Branches 0 Tags
35bdfca5ad370069bf4820cacf4fa6902050f56d
Commit Graph

15558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b029e4d451 am 2f6ded27: Add secondary text to cards. 
* commit '2f6ded27f69c67b64b65e754beb56adc5ed651d0':
  Add secondary text to cards.
 2014-10-30 00:34:16 +00: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
82435b27f7 am f66eadb5: SupportLeanbackDemo: Add test case for updating overview row 
* commit 'f66eadb5d48ad0deeb373de9abf3ab053cdd9226':
  SupportLeanbackDemo: Add test case for updating overview row
 2014-10-29 22:55:31 +00:00
Xavier Ducrohet
f75191cb3e am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex. 
* commit '0d574614cf568ec34e0804e6f7210a2d1a502d7f':
  Update build-tools and support for multidex.
 2014-10-29 22:53:19 +00:00
Xavier Ducrohet
2c799e0856 am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools. 
* commit 'e67c313ea0781650b7a31308dbe2cc5919425a3e':
  Add jack/jill/multidex lib to build-tools.
 2014-10-29 22:53:18 +00:00
bohu
8a29ecdd5e am 5bedd192: am ccaaeb5f: am c01f2d39: Merge "Update system images to revision 3" into lmp-dev 
* commit '5bedd1920b2af34b844f12bd4fa50047df57a22f':
  Update system images to revision 3
 2014-10-29 22:53:17 +00:00
Xavier Ducrohet
94f4c80394 am 1770d4bd: am 17d47a10: am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev 
* commit '1770d4bdca62a1798aaa83618cc78450020162bf':
  Update build tools version to 21.1.0. DO NOT MERGE.
 2014-10-29 22:53:16 +00:00
Takeshi Hagikura
0ebad4632d am e38db4c5: am 5350100b: am f6855153: Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev 
* commit 'e38db4c528de2cd59370f6e6980ac4ba0d8221ab':
 2014-10-29 22:53:15 +00: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
99cf1af3c1 am 455a4c3f: Merge "SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()" into lmp-mr1-dev 
* commit '455a4c3f915bce079ca2aceb4fc30b2f6c44dd14':
  SupportLeanbackDemo: Add test case of ArrayObjectAdapter.replace()
 2014-10-28 22:33:08 +00: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
23dfdd0984 am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev 
* commit '56fd4241e6cdf9af750e18d36900b7b8552ff45f':
  Enable building gtest for Windows
 2014-10-28 17:45:08 +00:00
Adam Lesinski
56fd4241e6 Merge "Enable building gtest for Windows" into lmp-mr1-dev 2014-10-28 17:41:47 +00:00
Dake Gu
1eaf20c653 am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit 'd18c4a82e0a9837301436411867ca56bfed3a36f':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 07:11:41 +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
a819c32dcb am ca4362bc: am a916086f: am 5aad4e45: am bd48d1e6: (-s ours) am 05ef7f04: DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3) 
* commit 'ca4362bc81e8bef2820536a2b552dea8d383b4d1':
  DO NOT MERGE: Package samples for Clockwork Beryl (API 20, Samples Rev 3)
 2014-10-24 23:41:32 +00:00
Takeshi Hagikura
91655c8f79 am 41465421: am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev 
* commit '41465421296619974efea860a349102b9f31ebfa':
  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:41:26 +00: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
a5d6afdcbd am 2247b043: DO NOT MERGE: idegen: Skip directories named *.java when parsing source. 
* commit '2247b043df5086e285ec4192a8d79a3d9b6c1045':
  DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
 2014-10-24 18:26:34 +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