drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,378 Commits 1 Branch 0 Tags
Commit Graph

127378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
0356f462b3 am 53c90cf9: am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 
* commit '53c90cf916ddd1151f042a61a569ea75a220b26e':
  Support CAST V2 Authentication in MediaDrm
 2014-04-01 22:27:02 +00:00
Craig Mautner
b67c41d281 am 74ee938d: resolved conflicts for merge of ffb22827 to master 
* commit '74ee938dcc5e1ab0309dd87278e26f604c756b26':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 22:27:00 +00:00
Jeff Tinker
53c90cf916 am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 
* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
  Support CAST V2 Authentication in MediaDrm
 2014-04-01 22:23:21 +00:00
Craig Mautner
74ee938dcc resolved conflicts for merge of ffb22827 to master 
Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
 2014-04-01 15:20:16 -07:00
Jeff Tinker
6dc8063d2a am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 
* commit '433a063309ba9ff9cdce4f9688e027c642a79505':
  Support CAST V2 Authentication in MediaDrm
 2014-04-01 22:00:49 +00:00
Alan Viverette
6259933ec9 Switch framework Holo references to Quantum.Light 
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
 2014-04-01 14:57:39 -07:00
John Reck
624818b0c1 am 4126693b: Merge "Disable RenderThread" 
* commit '4126693be37244116d23e9c6dce2a15b88ad988f':
  Disable RenderThread
 2014-04-01 21:57:34 +00:00
Craig Mautner
ffb22827d7 am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:56:55 +00:00
Jeff Tinker
433a063309 Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 2014-04-01 21:54:29 +00:00
John Reck
4126693be3 Merge "Disable RenderThread" 2014-04-01 21:51:40 +00:00
John Reck
9afe775ca9 Disable RenderThread 
Now that there's a half dozen bugs to fix, switch back
 to the stable renderer until the issues are addressed

Change-Id: I1513cf26717e8ab6b1a038e86ae9a40f5f1a3c50
 2014-04-01 14:49:21 -07:00
Craig Mautner
2b6fe2990d am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:48:04 +00:00
Michael Kolb
dd54a9f867 am 4bb047fa: Fix build after bad merge resolution 
* commit '4bb047fa5e6d43a027bfe1dfe23b3541e3910a31':
  Fix build after bad merge resolution
 2014-04-01 21:47:55 +00:00
Craig Mautner
c70f15fe29 am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit '2fc798a2270cda98366776af489d45c1043e831d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:41:15 +00:00
Michael Kolb
4bb047fa5e Fix build after bad merge resolution 
Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
 2014-04-01 14:38:57 -07:00
Alan Viverette
e51f7ed3d8 am 9b3b78bd: Merge "Quantum style for RatingBar, alert dialog layouts" 
* commit '9b3b78bdaf48d8199c42068e0f2a91d4b107b3a5':
  Quantum style for RatingBar, alert dialog layouts
 2014-04-01 21:31:24 +00:00
Alan Viverette
9b3b78bdaf Merge "Quantum style for RatingBar, alert dialog layouts" 2014-04-01 21:27:03 +00:00
Jeff Tinker
e4095a80b6 Support CAST V2 Authentication in MediaDrm 
Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
 2014-04-01 14:25:35 -07:00
Alan Viverette
2f472117d7 Quantum style for RatingBar, alert dialog layouts 
Change-Id: I70cab4d32de44d41b08602bc11a09d451f267127
 2014-04-01 14:24:49 -07:00
Fabrice Di Meglio
249f17644b am 724a4f7a: Merge "Update SearchIndexables contract for allowing summary ON and OFF indexing" 
* commit '724a4f7aea3723034d66e45cec538da7ff26fb93':
  Update SearchIndexables contract for allowing summary ON and OFF indexing
 2014-04-01 21:23:03 +00:00
Fabrice Di Meglio
724a4f7aea Merge "Update SearchIndexables contract for allowing summary ON and OFF indexing" 2014-04-01 21:17:03 +00:00
Michael Kolb
2ece6e434a am 7fbde1e8: resolved conflict for merge of 2c73e08d to master 
* commit '7fbde1e83703f800c98c1ef7c543f3146cfa43ef':
  Add outset to decor view measuring
 2014-04-01 21:13:31 +00:00
Michael Kolb
7fbde1e837 resolved conflict for merge of 2c73e08d to master 
Change-Id: Iee2e1f773469db0ba26b153193945a6c246af151
 2014-04-01 14:06:11 -07:00
Craig Mautner
2fc798a227 resolved conflicts for merge of 8c6e6e73 to klp-dev 
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
 2014-04-01 13:57:37 -07:00
Michael Kolb
2c73e08d36 am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev 
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
  Add outset to decor view measuring
 2014-04-01 20:46:38 +00:00
John Spurlock
ab1eea5464 am f96b6c42: Merge "Zen Mode QS tweaks." 
* commit 'f96b6c427fc8c3593de3edc1c857b27ed7810f4c':
  Zen Mode QS tweaks.
 2014-04-01 20:45:27 +00:00
John Spurlock
f96b6c427f Merge "Zen Mode QS tweaks." 2014-04-01 20:41:08 +00:00
Michael Kolb
17bbd976c0 Merge "Add outset to decor view measuring" into klp-modular-dev 2014-04-01 20:40:35 +00:00
John Spurlock
1bdb48e31a Zen Mode QS tweaks. 
- Move settings button to the bottom.
 - Align title left.
 - Fix padding.
 - Auto-activate on dialog launch.

Bug:13670014
Change-Id: I5a88e97a84b66bf6200473c147b71cc7ceeb0b95
 2014-04-01 16:38:05 -04:00
Craig Mautner
8c6e6e7372 am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959 am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:43:41 +00:00
quddusc
61c32c9cd2 am 448b0c35: am 913c9036: am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit '448b0c354477dcddda91181a539de73f1719de26':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 19:42:58 +00:00
Scott Main
7c92406de8 am bacc4a7e: am f80749c5: am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'bacc4a7efb3f33214f4a71a50c0492f469974cb4':
  laptop image with redacted
 2014-04-01 19:42:55 +00:00
Scott Main
1dd0496570 am d959a3d3: am 402f2304: am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit 'd959a3d31c7ef866fa870a79bffce94d02026199':
  dashbaord update for 4/1/14
 2014-04-01 19:42:52 +00:00
Ricardo Cervera
f4e894a4da am 3358898c: am 3b7432d2: am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit '3358898cd876fbefc4a6e3a8e52dd6f5de93eabe':
  docs: Renamed the document on building with Android Studio
 2014-04-01 19:42:49 +00:00
quddusc
448b0c3544 am 913c9036: am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit '913c903612b63e97b340f84dc742875672923f84':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 19:38:31 +00:00
Scott Main
bacc4a7efb am f80749c5: am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'f80749c5c52de0609e27da216b7c6daf8e23a34a':
  laptop image with redacted
 2014-04-01 19:38:27 +00:00
Scott Main
d959a3d31c am 402f2304: am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit '402f23046c4a624527937b61926d65a9935a9b60':
  dashbaord update for 4/1/14
 2014-04-01 19:38:23 +00:00
Ricardo Cervera
3358898cd8 am 3b7432d2: am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit '3b7432d2e4ddc9efda5cc38f9008d40d6b4ef951':
  docs: Renamed the document on building with Android Studio
 2014-04-01 19:38:16 +00:00
Craig Mautner
d1c82f8fc2 am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:36:48 +00:00
Craig Mautner
1cb3c1d381 am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:30:41 +00:00
quddusc
913c903612 am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit 'f425e5ea05bf445ab97176fe4a79e54f976d22b8':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 19:29:52 +00:00
Scott Main
f80749c5c5 am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'c37960733aebed4ef4d64d72f7658534f9fd5698':
  laptop image with redacted
 2014-04-01 19:29:45 +00:00
Scott Main
402f23046c am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit '3bd0a44bbf8de4dc1d190fffe91a10b8f1e2243f':
  dashbaord update for 4/1/14
 2014-04-01 19:29:41 +00:00
Ricardo Cervera
3b7432d2e4 am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
  docs: Renamed the document on building with Android Studio
 2014-04-01 19:29:38 +00:00
Craig Mautner
fc80fbe3d5 am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:24:23 +00:00
Craig Mautner
7bd0b65233 am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c Fix FLAG_DISMISS_KEYGUARD not working 
Fixes bug 13672528.

Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
 2014-04-01 12:10:54 -07:00