Commit Graph

37601 Commits

Author SHA1 Message Date
Brian Carlstrom
1ad28fd8fc am ed99dc89: am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit 'ed99dc89c32830cffe7a3912b2026942910c4c8f':
  Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 20:10:43 +00:00
Brian Carlstrom
ed99dc89c3 am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '7156b7c65d6f158c4898a93f8e2cea0bf94791d1':
  Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 20:06:06 +00:00
Brian Carlstrom
7156b7c65d am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
  Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 19:59:31 +00:00
Adrian Roos
e6978cda71 am 53ab5174: Merge "Define trust agent framework components"
* commit '53ab5174d5009786dc58da3011181b77e325c130':
  Define trust agent framework components
2014-03-31 19:26:11 +00:00
Adrian Roos
53ab5174d5 Merge "Define trust agent framework components" 2014-03-31 19:21:05 +00:00
Adrian Roos
82142c21dd Define trust agent framework components
Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.

Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
2014-03-31 21:18:28 +02:00
Alan Viverette
58c8a028d7 am 883e04b3: Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"
* commit '883e04b3c9ec3e3e976661c7accfc530c2d0e21e':
  Remove unthemed drawable cache, since canApplyTheme != isThemed
2014-03-31 19:14:28 +00:00
Adrian Roos
82f19417ed am 716f20d8: Merge "Define initial trust agent API"
* commit '716f20d833537461fef7d5d7ed62157451391f1c':
  Define initial trust agent API
2014-03-31 19:14:25 +00:00
John Reck
0949792f77 am b4a132a0: Merge "Turn on RenderThread"
* commit 'b4a132a05f5dc1cc10352d63cb80921b1004bd7a':
  Turn on RenderThread
2014-03-31 19:14:23 +00:00
Alan Viverette
883e04b3c9 Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed" 2014-03-31 19:12:45 +00:00
Adrian Roos
716f20d833 Merge "Define initial trust agent API" 2014-03-31 19:11:36 +00:00
Jorim Jaggi
d529e294ae Merge "Reuse KeyguardViewMediator for new Keyguard implementation." into master-lockscreen-dev 2014-03-31 19:11:32 +00:00
John Reck
b4a132a05f Merge "Turn on RenderThread" 2014-03-31 19:09:13 +00:00
Jorim Jaggi
5cf17879a3 Reuse KeyguardViewMediator for new Keyguard implementation.
This change reuses KeyguardViewMediator for the new Keyguard
implementation in status bar. KeyguardViewManager is replaced by
StatusBarKeyguardManager which handles adding the view, setting the
state etc. StatusBarWindowManager is introduced to managed the window
of the status bar, which has the logic of both the old Keyguard window
and the old status bar window. In the current implementation, Keyguard
gets displayed like it would be in the bouncer state, but that's likely
to change in the future. Also, setHidden in IKeyguardService is also
renamed to setOccluded, as the word hidden interferes with the
terminology when dismissing the Keyguard.

Bug: 13635952
Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
2014-03-31 20:58:31 +02:00
Adrian Roos
ff2144ccb4 Define initial trust agent API
Adds the minimal API needed to define a useful trust agent.

Bug: 13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc
2014-03-31 20:40:49 +02:00
Brian Carlstrom
ff9ca781d0 Improve detail message for X509TrustManagerExtensions argument validation
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
2014-03-31 11:22:34 -07:00
John Reck
26311cb5d5 am 8e150fef: Merge "Add invokeFunctor"
* commit '8e150fef2bb0d3e672b7ecba2caa35ee37a8c27d':
  Add invokeFunctor
2014-03-31 18:09:05 +00:00
John Reck
8e150fef2b Merge "Add invokeFunctor" 2014-03-31 18:04:06 +00:00
John Reck
0f61cde234 Turn on RenderThread
Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88
2014-03-31 10:19:14 -07:00
Jorim Jaggi
8ae65aecc8 Address comments for I059d80d8b9b9818a778ab685f4672ea2694def63
Bug: 13635952
Change-Id: I5d2bd44b3588621f26d94baab161e4e2444197a8
2014-03-31 12:15:18 +00:00
Jorim Jaggi
bd490ad59f Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev 2014-03-31 12:05:54 +00:00
John Reck
0d1f634f4b Add invokeFunctor
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
2014-03-28 20:57:32 -07:00
Wei Wang
ab4fc115e9 am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
  Callback on correct method when status is unsuccessful.
2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
John Reck
c75db8266b Merge "Remove kStatusInvoke & kStatusDraw" 2014-03-29 01:41:50 +00:00
John Reck
903d6407b0 Merge "Remove DisplayList.java" 2014-03-29 01:41:44 +00:00
Chris Craik
42dda81e15 Merge "Update several stale RenderNode variable names" 2014-03-29 01:39:57 +00:00
Chris Craik
64a12e177d Update several stale RenderNode variable names
Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b
2014-03-28 18:12:12 -07:00
Michael Wright
84ad5d8891 am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
  Add InputDevice#supportsSource(int).
2014-03-29 01:09:30 +00:00
Michael Wright
5d7db503bd am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
  Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0 Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev 2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1 Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Chris Craik
69a30b5e54 Merge "Simplify RenderNode refresh/build/update process" 2014-03-29 00:07:07 +00:00
Chris Craik
df0c431e6c Simplify RenderNode refresh/build/update process
A View's RenderNode is created lazily, but the instance never changes
afterward.

Change-Id: I0b05769cd49aa55061d3fb8c2ea55a04e8391e48
2014-03-28 17:03:12 -07:00
Alan Viverette
efaf51ad0c Merge "Fix drag-to-open forwarding behavior" 2014-03-28 23:59:39 +00:00
Alan Viverette
78efdbac8a Fix drag-to-open forwarding behavior
BUG: 13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
2014-03-28 16:53:56 -07:00
John Reck
750ca6dbdb Remove kStatusInvoke & kStatusDraw
They are unused

Change-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e
2014-03-28 16:43:15 -07:00
Jeff Hao
7d89b85f49 am f1354dd2: am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit 'f1354dd206a74e1475e8c1f8682dfd9d5e146f00':
  Mark constructor as accessible in LayoutInflater.
2014-03-28 23:40:36 +00:00
Selim Gurun
b4f27c95bc Merge "Support for new gTLDs" 2014-03-28 23:35:10 +00:00
John Reck
673a784c60 Remove DisplayList.java
Bug: 13478302

Change-Id: I88574ec585b7eb165f3009a4f0492c12f70d3513
2014-03-28 23:19:52 +00:00
Jeff Hao
f1354dd206 am d648e5f7: am e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit 'd648e5f7ba26fc835c0448740f33c49874d51a3b':
  Mark constructor as accessible in LayoutInflater.
2014-03-28 23:05:46 +00:00
Fabrice Di Meglio
c0469c00bf Merge "SearchView improvement for IME" 2014-03-28 23:01:59 +00:00
Fabrice Di Meglio
2182f2aaf4 SearchView improvement for IME
- fix IME not closing when not having a SearchableInfo

Change-Id: I3e6e168be1e26138fe0ceb967bbd12fa35db0903
2014-03-28 15:56:51 -07:00
Yuhao Zheng
93627ac86c Merge "Wifi hotspot stack initial hook up" 2014-03-28 22:49:51 +00:00
Alan Viverette
351f0c1d26 Remove unthemed drawable cache, since canApplyTheme != isThemed
Change-Id: I460673bfa491e67ea239f8ebb03898a0633e7565
2014-03-28 15:25:27 -07:00
Jorim Jaggi
380ecb81db Make Keyguard a library and make StatusBar the new Keyguard.
This change achieves a couple of things:
- Let Keyguard be a library, so we can use it in SystemUI.
- Introduce FLAG_KEYGUARD for windows and deprecate TYPE_KEYGUARD. Make
all the TYPE_KEYGUARD behaviour dependant on the flag.
- Implement a new KeyguardService in SystemUI, and bind that service
from PhoneWindowManager.
- Introduce BaseStatusBar.setKeyguardState and inflate
KeyguardSimpleHostView there and use FLAG_KEYGUARD for the window, such
that the status bar window essentially gets the Keyguard.

Bug: 13635952
Change-Id: I059d80d8b9b9818a778ab685f4672ea2694def63
2014-03-28 22:35:03 +01:00
Svetoslav
aaa114215b Disable node tree consistency check on user builds.
Change-Id: I6ec8cfc41fefc12e4c8fb6f39715831f072cb074
2014-03-28 13:43:12 -07:00