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

150014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lenka Trochtova
3b60140f45 am b32505ed: am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'b32505ed5945fde278924c374ff90f8b8e5b67bb':
  Make AudioState constructors public
 2014-08-18 19:28:38 +00:00
Deepanshu Gupta
d9f0102f0d am 23748f1a: am eab5df3a: am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit '23748f1a190c3f9d5c3f71e41f7138f1eafed897':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:28:33 +00:00
Deepanshu Gupta
8d030f7094 am 2d1aa0f6: am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '2d1aa0f63f133e0db3c621cdff5e48ce513f8fdc':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:28:28 +00:00
Santos Cordon
7fe51ee4ee am d2b3eeff: am ac0a6e48: Update conference call APIs. 
* commit 'd2b3eefff963e410cc38ef3580615c6c4ba7df27':
  Update conference call APIs.
 2014-08-18 19:28:23 +00:00
Guang Zhu
ec78642ff2 am c1b9d693: am 9afdb3f7: Merge "Disable immersive mode confirmation for test automation" into lmp-dev 
* commit 'c1b9d69351b7d75c7dbe7ed28fbdb158eb3ad899':
  Disable immersive mode confirmation for test automation
 2014-08-18 19:28:18 +00:00
Kenny Root
74a74b637e am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit 'b4b398b7cae59c581930acc58d9b9f09262c0695':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:28:14 +00:00
Lenka Trochtova
0fb23ebe75 am 15a4b306: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit '15a4b30652b797bf8e1997d85627b345de198813':
  Make AudioState constructors public
 2014-08-18 19:18:59 +00:00
Deepanshu Gupta
4acd03f7ca am eab5df3a: am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'eab5df3ab95d47e7c856648b11878163589c7b35':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:18:55 +00:00
Deepanshu Gupta
1d0931a681 am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '8f7cc496d2736eaccdbe1409d464e737c9909e3d':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:18:50 +00:00
Santos Cordon
6989f648e9 am ac0a6e48: Update conference call APIs. 
* commit 'ac0a6e48dd2498a17d2e9d1617d76045bd9ae01a':
  Update conference call APIs.
 2014-08-18 19:18:45 +00:00
Guang Zhu
2e714195a7 am 9afdb3f7: Merge "Disable immersive mode confirmation for test automation" into lmp-dev 
* commit '9afdb3f726b6c484973a6916942c2c9da90099c8':
  Disable immersive mode confirmation for test automation
 2014-08-18 19:18:41 +00:00
Kenny Root
9e22a99e32 am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 
* commit '286a143456d15dad41f3dad1e34359144b2db489':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
 2014-08-18 19:18:36 +00:00
Dianne Hackborn
80086cd4b4 am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit 'a0a646245c6aefa9d8303b641256381e639f0d47':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 19:17:51 +00:00
Dianne Hackborn
84ba83bb3d am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 19:17:47 +00:00
Lenka Trochtova
8450fd17b1 Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 2014-08-18 18:06:41 +00:00
Deepanshu Gupta
5cb5059b6c am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK 
* commit 'da9baa15bf780d4e8924adbed3d8863c75da5e6c':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:26 +00:00
Deepanshu Gupta
6e8a98c8b7 am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit 'a4ceb9e64cd1ee6302e41c7799ebb6610af96d0e':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:07 +00:00
Santos Cordon
823fd3c79d Update conference call APIs. 
Clean up conference call APIs to use a distinct type separate from
Connection.  Also allow the addition of Conference calls at any point
using addConference() API method.

Bug:16844332
Bug:16449372
Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
 2014-08-18 17:30:58 +00:00
Dianne Hackborn
b8284a8bb8 am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 
* commit '728f5d08c891a4e6f9e437bd2398ce9ea36db8b6':
  Work on issue #16629489: Google (Play?) Services eating through battery
 2014-08-18 17:21:02 +00:00
Dianne Hackborn
c14776cb3c am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 
* commit 'e882cea6d6f92efd68191f1f74fd27fb9e1d9016':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
 2014-08-18 17:20:57 +00:00
Adrian Roos
48986869c3 am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:14:52 +00:00
Adrian Roos
38f88e756d am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires 
* commit 'a31e2348e929c76572e634bc67df10581e6684fa':
  Play "device trusted" sound when onTrustInitiatedByUser fires
 2014-08-18 17:07:43 +00:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires 
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
 2014-08-18 16:53:27 +00:00
John Reck
30bb86629a am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev 
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
  Don't mangle layer paint's alpha
 2014-08-18 16:21:34 +00:00
John Reck
79c22cd004 am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev 
* commit '976189a1b563121b442ec242c5653acb5df835d9':
  Don't mangle layer paint's alpha
 2014-08-18 16:13:30 +00:00
Adrian Roos
0e9ed4295e am 90ff15e8: am cd91eaf9: Fix bars jumping to black on activity launch 
* commit '90ff15e8d1347319db0f08848160eb85b9bcea37':
  Fix bars jumping to black on activity launch
 2014-08-18 14:52:41 +00:00
Adrian Roos
b5b3e7ab82 am cd91eaf9: Fix bars jumping to black on activity launch 
* commit 'cd91eaf966a51df6dc0605a95f80b6e09289bd67':
  Fix bars jumping to black on activity launch
 2014-08-18 14:45:01 +00:00
Adrian Roos
d47ad033c3 Fix bars jumping to black on activity launch 
During animations, the wallpaper crop is the
union of the start and end crop. This prevents
the system bars from jumping to black when an
activity with opaque bars is launched.

Bug: 16441036
Change-Id: Ic0f3bc2e83b9830514a3456a27ae6f23716f3240
 2014-08-18 14:37:18 +00:00
Jason Monk
d6ea61cd15 am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev 
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
  Fixes to lock task API from API review
 2014-08-18 13:51:09 +00:00
Jason Monk
e127b56463 am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev 
* commit '71793e71d67472a7d42f072cbd6266d4302fefde':
  Fixes to lock task API from API review
 2014-08-18 13:43:33 +00:00
John Spurlock
24a1fd5c04 am c1975a18: am 4fd20a99: Merge "QS: Add scanning progress state indication." into lmp-dev 
* commit 'c1975a18f5fc9b8b0b383fd1d223d9eda711a9a0':
  QS: Add scanning progress state indication.
 2014-08-18 13:13:10 +00:00
John Spurlock
fb20636811 am 4fd20a99: Merge "QS: Add scanning progress state indication." into lmp-dev 
* commit '4fd20a99733856ab3ec9920a48e2860187ad4473':
  QS: Add scanning progress state indication.
 2014-08-18 13:06:07 +00:00
Piotr Jastrzebski
fc1b26fc68 am 626e1c65: am 8a28e16c: Merge "Update ziparchive usage to the new API." 
* commit '626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e':
  Update ziparchive usage to the new API.
 2014-08-18 09:12:39 +00:00
Piotr Jastrzebski
626e1c65ef am 8a28e16c: Merge "Update ziparchive usage to the new API." 
* commit '8a28e16cd346bf28d00d8d5935ed092ffb59e5c9':
  Update ziparchive usage to the new API.
 2014-08-18 09:04:08 +00:00
Terry Heo
b47e183ca9 am 0190fd8a: am f9ed92a3: Merge "CEC: Handle Remote Control command" into lmp-dev 
* commit '0190fd8a6f9389f9eab0a908bcc1b78ecce5fb4b':
  CEC: Handle Remote Control command
 2014-08-18 07:37:58 +00:00
Terry Heo
dbbbb8d401 am f9ed92a3: Merge "CEC: Handle Remote Control command" into lmp-dev 
* commit 'f9ed92a3bd38aad3106ca31cb368e3d52fcb5400':
  CEC: Handle Remote Control command
 2014-08-18 07:30:04 +00:00
Chulwoo Lee
26c2c1731c am ee5c44e3: am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev 
* commit 'ee5c44e3581945f9eb739e1ef21e58e60b84302d':
  Fix ConcurrentModificationException in PersistentDataStore
 2014-08-18 05:57:18 +00:00
Chulwoo Lee
e33564ab9c am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev 
* commit '6cc201929764089c49d777ed983ee776b38054e6':
  Fix ConcurrentModificationException in PersistentDataStore
 2014-08-18 05:49:26 +00:00
Jungshik Jang
95b1589671 am ce7221ac: am 94a31604: Implement MHL send key action. 
* commit 'ce7221ac51b892468d848e6f3384ca4a1993ba13':
  Implement MHL send key action.
 2014-08-18 05:42:19 +00:00
Jungshik Jang
730095c1d8 am 94a31604: Implement MHL send key action. 
* commit '94a31604833f069f1b059aa803299f19543fb5d5':
  Implement MHL send key action.
 2014-08-18 05:35:12 +00:00
Jinsuk Kim
b347ed75cd am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 
* commit 'c68c9dbdd5b1e70a429ff2283348a5609522d8cb':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
 2014-08-18 02:37:42 +00:00
Michael Wright
fb9570f5d0 am a08b5883: am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev 
* commit 'a08b58839fa7e4c9fb05eedfc06a437883a5a026':
  Remove MediaProjection#createAudioRecord API
 2014-08-18 02:37:37 +00:00
Jungshik Jang
4612a6e111 Implement MHL send key action. 
This class introduces two classes, MhlSendKeyAction and
HdmiMhlKeycode.
 - MhlSendKeyAction is a feature action that manages MHL message
for RCP, Remote Control Pass Through.
 - HdmiMhlKeycode is a collection of MHL keycode including keycode
mapping between MHL and Android keycode.

Bug: 16966459
Change-Id: Ib3f7229c71b66837cd0d239e5af1940dfccee7df
 2014-08-18 11:16:47 +09:00
Michael Wright
9c64c18b10 am 1a63d067: am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev 
* commit '1a63d067582aa909b48832faefac7f97ab4825f1':
  Change 'disable hardware keyboard' to 'show input method'
 2014-08-18 02:10:24 +00:00
Jinsuk Kim
20961652cf am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 
* commit '47a912291f57766dd0e924eee50bee8d653d297a':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
 2014-08-18 01:32:08 +00:00
Michael Wright
90db970c5c am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev 
* commit '4d568b1c24a171b6de988133bb892d1f4ca56d1a':
  Remove MediaProjection#createAudioRecord API
 2014-08-18 01:32:02 +00:00
Michael Wright
2b82365000 am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev 
* commit 'ab1b372cfcb5b0607fdf7acf84d2400e4837dff7':
  Change 'disable hardware keyboard' to 'show input method'
 2014-08-18 01:08:54 +00:00
Brian Carlstrom
d8ff5dde2e am 18a7b459: am 7c8318c0: Merge "PackageInfo is a class, not a struct" 
* commit '18a7b459f10f477a83f8d8356a62eff39065dd13':
  PackageInfo is a class, not a struct
 2014-08-18 00:04:01 +00:00
Brian Carlstrom
18a7b459f1 am 7c8318c0: Merge "PackageInfo is a class, not a struct" 
* commit '7c8318c0e85540739afba3e8c0f922176bc299cd':
  PackageInfo is a class, not a struct
 2014-08-17 23:55:44 +00:00
Robert Greenwalt
06bd97650d am c993be52: Add tcp buffer size conduit to NetworkAgent. 
* commit 'c993be52b3e9a45a882ddc305a133c1859f9d50d':
  Add tcp buffer size conduit to NetworkAgent.
 2014-08-17 23:14:42 +00:00