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

15420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
fcd28181a1 sdk.atree: Disable Wear samples for lmp branches 
Wear samples are currently generated for the klp-modular branch only.

Change-Id: I127a75d171a31f334c5006b6ce251ff1d4f35f42
 2014-11-06 21:11:46 +00:00
Jim Miller
1064b49ced am eb7edd58: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit 'eb7edd585abb0bc6c039882cdec8dc8a9fd4e4cc':
  Update TrustAgentService API after review
 2014-11-06 02:57:33 +00:00
Jim Miller
eb7edd585a Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:51 +00:00
Adam Lesinski
d155da9790 Add split-select tool to SDK build. 
Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
 2014-11-05 11:34:03 -08:00
Dmitry Shmidt
5cc7f9ba4c am d00a0a73: Development: Connectivity: Fix receiver leakage 
* commit 'd00a0a734ef64ba917e5a124a16c1e4c196dd187':
  Development: Connectivity: Fix receiver leakage
 2014-11-04 03:32:37 +00: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
f8a6d8f1df am 66b2f251: am 883b17b3: am 5b7f5d2b: Update build-tools revision. DO NOT MERGE. 
* commit '66b2f251c72c82098a2a84a2b87642e42c5d26b8':
  Update build-tools revision. DO NOT MERGE.
 2014-11-01 16:05:48 +00:00
Xavier Ducrohet
d150e285b5 am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around. 
* commit '4aceb7250d209b848b44a64984953e0d45c50b3e':
  Move mulit-dex files around.
 2014-11-01 16:05:43 +00: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
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