Kenny Guy
2a764949c9
Rename related users to profiles.
...
Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.
Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
2014-04-02 13:44:50 +01:00
Alan Viverette
30cac644f1
Merge "Switch device default theme over to Quantum"
2014-03-31 22:38:14 +00:00
Baligh Uddin
bf93a28f4c
Merge "Import translations. DO NOT MERGE"
2014-03-31 22:11:26 +00:00
Alan Viverette
3054e2d5b1
Switch device default theme over to Quantum
...
Change-Id: I4d8ad0a9d62b898ae34900b4a749e75a975af5af
2014-03-31 15:01:00 -07:00
Zhihai Xu
6b96c1b2ea
am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit '7d394df2ab8f951215a775df8d2bd9e6518e746a':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:35:38 +00:00
Zhihai Xu
7d394df2ab
am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde
Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
2014-03-31 21:21:54 +00:00
ztenghui
2f9ec3560d
Merge "Make the reveal animation API public"
2014-03-31 20:08:12 +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
Glenn Kasten
d1f7354dd8
Fix build from multiple declaration
...
Change-Id: Id2dd703aedef0423605407ab7a14ef7b48c2fcdb
2014-03-31 12:26:22 -07: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
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
John Reck
b4a132a05f
Merge "Turn on RenderThread"
2014-03-31 19:09:13 +00:00
Baligh Uddin
c377dde565
Import translations. DO NOT MERGE
...
Change-Id: I81bf08f36ce519a1cc397fc3cbb1d92878df54f1
Auto-generated-cl: translation import
2014-03-31 12:05:36 -07:00
Glenn Kasten
1dd51abaae
Merge "Use set() return value instead of separate call to initCheck()"
2014-03-31 19:03:32 +00: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
Glenn Kasten
47bbaea4c3
Merge "Include more information in AudioTrack JNI error logs"
2014-03-31 18:07:43 +00:00
John Reck
8e150fef2b
Merge "Add invokeFunctor"
2014-03-31 18:04:06 +00:00
ztenghui
be23fa2f73
Make the reveal animation API public
...
Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6
2014-03-31 10:41:31 -07:00
Glenn Kasten
8f81d0832b
Include more information in AudioTrack JNI error logs
...
Change-Id: I0e57060dd46cce4ec8217bb7d122bd010c974717
2014-03-31 10:38:47 -07:00
Glenn Kasten
8bfe0555cc
Merge "Fix warnings"
2014-03-31 17:19:49 +00:00
John Reck
0f61cde234
Turn on RenderThread
...
Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88
2014-03-31 10:19:14 -07: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
Aaron Whyte
868f373b65
am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public k
...
* commit '23fd13de62762e98c32f2b7525f01f0bcdf416fd':
Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
2014-03-28 23:40:13 +00:00
Selim Gurun
b4f27c95bc
Merge "Support for new gTLDs"
2014-03-28 23:35:10 +00:00
Glenn Kasten
c5d142428a
Use set() return value instead of separate call to initCheck()
...
Change-Id: I6874ca00512d30824ecec10b8dc289993b985c7b
2014-03-28 16:32:10 -07:00
John Reck
673a784c60
Remove DisplayList.java
...
Bug: 13478302
Change-Id: I88574ec585b7eb165f3009a4f0492c12f70d3513
2014-03-28 23:19:52 +00:00