LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,293 Commits 2 Branches 0 Tags
e66b671dc72d62ca12dcb73fd4d3d6386dacabca
Commit Graph

16293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Lesinski
291e86fb92 am 23dfdd09: am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev 
* commit '23dfdd098448e193d63b0dcc4e5ba00b51ca2cff':
  Enable building gtest for Windows
 2014-10-29 00:17:32 +00: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
Dake Gu
1554fa4339 am 1eaf20c6: am d18c4a82: Merge "SupportLeanbackDemo: show case of different image scale type" into lmp-mr1-dev 
* commit '1eaf20c653e3223be91774687f5249229693bffd':
  SupportLeanbackDemo: show case of different image scale type
 2014-10-28 20:29:43 +00: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
Chenjie Luo
9d91239a4d am b793668b: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit 'b793668bd851c51ba1ff5ab3364bf5619404ea45':
 2014-10-25 19:54:09 +00:00
Baligh Uddin
b026fa1ffc am 3bef59ab: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3bef59abfcd6fa48df33b36fb17960289b721f8c':
 2014-10-25 19:54:08 +00:00
Baligh Uddin
fd23c3f1a2 am d5c6c1cd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit 'd5c6c1cdf729b9be5f54cdf9716e8e83e94d4629':
 2014-10-25 19:54:07 +00:00
Xavier Ducrohet
824490c66c am f2dcbd2e: (-s ours) am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE. 
* commit 'f2dcbd2e72d4cd393a96d71457a14268e95b592a':
 2014-10-25 19:54:06 +00:00
Trevor Johns
9e09cc9929 am cc763b72: am 36274ac5: Add additional samples for L to sdk.atree 
* commit 'cc763b72d5d630c0212baf2f9536ac51dd068e19':
 2014-10-25 19:54:02 +00:00
Trevor Johns
34dd175908 am de236d16: am 6876a9cf: Add browseable samples for L SDK release 
* commit 'de236d16d026140294b94744e2ee9a5dcac6f60a':
 2014-10-25 19:53:58 +00:00
Trevor Johns
cfec1532dc am e3e839e5: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev 
* commit 'e3e839e52b757b29da2674a4cebbb2969c977959':
 2014-10-25 19:53:54 +00:00
Trevor Johns
6bf079a32f am 8176b906: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample 
* commit '8176b9067fcd0f15d331c007905f165a5966d617':
 2014-10-25 19:53:50 +00:00
Trevor Johns
12c9391bc7 am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev 
* commit '3beb9eae9a43c579a376b4256e07ff97852ed258':
 2014-10-25 19:53:46 +00:00
Andrew Hsieh
220869bbd6 am d10b06eb: am 1305bed1: am c13cf09c: Merge "Add asm/a.out.h to arm64/mips/mips64" 
* commit 'd10b06ebe3300abfacb4b85f9a2466d798e3a947':
 2014-10-25 19:53:44 +00:00
Andrew Hsieh
8d9384e23e am 10efbc14: am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use" 
* commit '10efbc1461e264b50772c4ab87f99d8ce4a7d610':
 2014-10-25 19:53:43 +00:00
Andrew Hsieh
9fe3045fe1 am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21" 
* commit '2f5539a4eb682e0ad9b44641f5d98af0d97fed9a':
 2014-10-25 19:53:41 +00:00
Neil Fuller
09ac46eeed am 29329726: am 29923a44: am a6e8e0d8: Merge "Remove dependencies on FloatMath" 
* commit '29329726c3b30991378b9d5e376db57a572ede38':
 2014-10-25 19:53:40 +00:00
Andrew Hsieh
ad8bbae857 am d6bf7265: am e6a62f60: am dc942b9c: Merge "Make memory_order_acquire visible in global namespace" 
* commit 'd6bf7265b3ca03a97b9f14d477dbd8db6889d4e7':
 2014-10-25 19:53:38 +00:00
Andrew Hsieh
f5a01d4e74 am 64724bcc: am 0d879513: am 106046ae: Merge "Rename android-L to android-21" 
* commit '64724bcca345c0b89bfc0ebd7b6fb2d1c7e9ca96':
 2014-10-25 19:53:36 +00:00
Andrew Hsieh
5e8eedd60e am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h" 
* commit '2a01c3f3f9a4b1a751c95617ddec17e92520440a':
 2014-10-25 19:53:34 +00:00