Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,276 Commits 3 Branches 0 Tags
1fb7dc0c00a72f3ded151ea41ec22b9caa3be42e
Commit Graph

56794 Commits

Author SHA1 Message Date
Tim Kilbourn
321db6f3a4 am 597973c9: am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev 
* commit '597973c999773f8e42b0b891b0d51e69fe798606':
  Update shadow parameters for television.
 2014-08-23 00:00:05 +00:00
Guang Zhu
90caceb7ee am 1312c106: am ed43020e: Merge "add some missing assert messages for wifi test" into lmp-dev 
* commit '1312c1064a848e8a0049901e8f5cdb63dc1eb729':
  add some missing assert messages for wifi test
 2014-08-22 23:59:36 +00:00
Tim Kilbourn
4af6348435 am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev 
* commit '442bb8f66804cfb9894176e6d4ac5b6c455a4caf':
  Update shadow parameters for television.
 2014-08-22 23:55:47 +00:00
Guang Zhu
17534d9cd5 am ed43020e: Merge "add some missing assert messages for wifi test" into lmp-dev 
* commit 'ed43020e15ac965bb2cc7c53b34848e2b953f2a2':
  add some missing assert messages for wifi test
 2014-08-22 23:51:06 +00:00
Tim Kilbourn
aa6215a0d2 Merge "Update shadow parameters for television." into lmp-dev 2014-08-22 23:45:40 +00:00
Tim Kilbourn
fbc1931d6a Update shadow parameters for television. 
Bug: 15859361
Change-Id: If22767a6aa81f897c0705fa0618c314df27b7dcd
 2014-08-22 16:44:53 -07:00
Guang Zhu
1109c7d4fe Merge "add some missing assert messages for wifi test" into lmp-dev 2014-08-22 23:36:01 +00:00
Jim Miller
db2fb70b19 am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '752889a944402983874e04da6f613872275aa3d0':
  Update TrustAgentService API after review.
 2014-08-22 23:28:08 +00:00
Elliott Hughes
49e927ecd6 am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit '8f0389527241cb5b8adada12b9084b5c7f38bb84':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:23:52 +00:00
Jim Miller
7d95c50fd6 am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9af7f4f66652d659fb17f4bc502362f0e6faf175':
  Update TrustAgentService API after review.
 2014-08-22 23:18:16 +00:00
Elliott Hughes
8821122225 am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit 'fff90ffb6bb113bea6297a7edf97679f4c835763':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:10:04 +00:00
Jim Miller
c7639333f8 Merge "Update TrustAgentService API after review." into lmp-dev 2014-08-22 23:08:32 +00:00
Elliott Hughes
ed40256670 Merge "Use CLDR narrow am/pm markers." into lmp-dev 2014-08-22 23:02:14 +00:00
Jim Miller
d4efaac5d5 Update TrustAgentService API after review. 
Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
 2014-08-22 22:43:30 +00:00
John Spurlock
48b9ca16f6 am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'c7d47057359ba66ce7ca56a20b7bcdf9af522042':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:23:15 +00:00
Pat Tjin
59935635a2 am dce17b0f: am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 
* commit 'dce17b0faee9594b31839502966c03504d9684c0':
  SurfaceControl: free ref when not used anymore
 2014-08-22 22:23:11 +00:00
John Spurlock
fd7c9500d0 am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'fa0f82886a3074b2990df9354eb320461f44bc50':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:12:10 +00:00
Pat Tjin
1aaeab110f am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 
* commit 'e0eb27c6d4c5e6cf2d9d0f2100a365ae74c3607b':
  SurfaceControl: free ref when not used anymore
 2014-08-22 22:12:05 +00:00
John Spurlock
7653a30ea0 Merge "Display notification effects suppressor in the volume panel." into lmp-dev 2014-08-22 22:09:35 +00:00
Guang Zhu
12747ab3aa add some missing assert messages for wifi test 
Change-Id: I04f4cbbca1a181ab1404fa3abba874e1f78fed3c
 2014-08-22 15:08:36 -07:00
John Spurlock
b4782526f5 Display notification effects suppressor in the volume panel. 
Bug:16958514

Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
 2014-08-22 18:08:17 -04:00
Pat Tjin
5fa3f3a995 Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 2014-08-22 22:04:37 +00:00
Adam Powell
9971017140 am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit 'cb3b976da10899bc7cfcc934ebf3eae9fa5d15db':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:45:38 +00:00
Robert Greenwalt
8fee69be0c am 6aaa0bc2: am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev 
* commit '6aaa0bc22b2bd8d6fac750dd4a46322d66804d61':
  Add config settings for ethernet/wifi tcp buffers
 2014-08-22 21:45:35 +00:00
Amith Yamasani
61b7dff862 am 0c581229: am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '0c581229cd4986c07bb877f8211a8c5471633efb':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:24:20 +00:00
Matthew Williams
e94569636f am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '74d65044fda9dedd72a7e80ec9a607bebdf5f484':
  JobScheduler only run jobs for started users.
 2014-08-22 21:24:15 +00:00
Adam Powell
448f033e78 am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit '2ad136dfb6e40c97a5012c75455fea7b109c2cee':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:23:20 +00:00
Robert Greenwalt
9712405ed8 am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev 
* commit '0c9bb058dbb6b615c729d945a7d3547b3e99b39d':
  Add config settings for ethernet/wifi tcp buffers
 2014-08-22 21:23:15 +00:00
Adam Powell
c9991c7149 Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 2014-08-22 21:20:24 +00:00
Robert Greenwalt
acb570cd84 Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev 2014-08-22 21:14:34 +00:00
Amith Yamasani
dbca3c3121 am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '654d72fd3c12bf0470e88debb0701a949914607e':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:14:10 +00:00
Matthew Williams
e7faa446a9 am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit 'd95fb7b383bf7534ddcaea4aeb76fb00e1f6e7be':
  JobScheduler only run jobs for started users.
 2014-08-22 21:14:05 +00:00
Amith Yamasani
6dd08fdd91 Merge "Show a user switching dialog before starting the user switch" into lmp-dev 2014-08-22 21:08:15 +00:00
Matthew Williams
12eec2341d Merge "JobScheduler only run jobs for started users." into lmp-dev 2014-08-22 21:08:06 +00:00
Elliott Hughes
fbba4317a8 am 942b8379: am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit '942b8379bfc2418d4cc33d45928949508bb390c5':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 21:03:20 +00:00
Adam Powell
2b7ff72683 Fix (another) measurement issue in ActionBarContainer 
Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.

Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
 2014-08-22 13:57:43 -07:00
Elliott Hughes
0b3d2d01d3 am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit '973526087efda830993a1f17a588d62930ce4520':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 20:54:45 +00:00
John Reck
a5f9567f2e am 661e8029: am 673b5523: Merge "Revert immutable Shader change" into lmp-dev 
* commit '661e8029fd1e74f4a452ba57a21ef0912cf0df53':
  Revert immutable Shader change
 2014-08-22 20:43:34 +00:00
Elliott Hughes
5d04fee900 Merge "Don't show the pseudolocales unless we're in developer mode." into lmp-dev 2014-08-22 20:42:19 +00:00
John Reck
1f5e141950 am 673b5523: Merge "Revert immutable Shader change" into lmp-dev 
* commit '673b5523f56abff839169b0da963b24015e4f061':
  Revert immutable Shader change
 2014-08-22 20:28:54 +00:00
Dianne Hackborn
9986e64643 am ceb86f91: am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit 'ceb86f912d9cc0cc0fa62f712b0105a5d239a973':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:22:53 +00:00
John Reck
ef22000ea9 Merge "Revert immutable Shader change" into lmp-dev 2014-08-22 20:19:34 +00:00
Dianne Hackborn
0df9722b5b am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit 'f5b988b8dc1b06f21121a4c639f44b62b94359b2':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:13:26 +00:00
Christian Robertson
4a7c5b33f3 am 7889aae3: am abf664ec: Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev 
* commit '7889aae3939e8474b8de75d50f9412e4f39e3e32':
  Changed the color of buttonBarButtonStyle in the Material theme
 2014-08-22 20:08:08 +00:00
Dianne Hackborn
250bf41b8e Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 2014-08-22 20:05:39 +00:00
Amith Yamasani
7805a10c86 Show a user switching dialog before starting the user switch 
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.

Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
 2014-08-22 13:00:22 -07:00
Christian Robertson
f2088d7e81 am abf664ec: Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev 
* commit 'abf664eca01fcae8d01f0ae1dec6b8aac2c602dc':
  Changed the color of buttonBarButtonStyle in the Material theme
 2014-08-22 19:57:35 +00:00
Thierry Strudel
5474f3396a SurfaceControl: free ref when not used anymore 
C standard does not ensure order in which arguments are evaluated leading to
faulty behavior in x86 case.

Bug: 17206275

Change-Id: I6553c55bcf646d93413135aed733f20b91852735
Signed-off-by: Thierry Strudel <thierry.strudel@intel.com>
 2014-08-22 19:48:27 +00:00
Christian Robertson
3b4a499257 Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev 2014-08-22 19:48:00 +00:00
Ronghua Wu
25a4b4b3dd am 4f643cf0: am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 
* commit '4f643cf0e7736b5be31419b38890cd92d6586936':
  VideoView: unhide setVideoURI api and add document.
 2014-08-22 19:33:17 +00:00