OSDN Git Service
Michael Wright [Thu, 5 Jun 2014 21:01:04 +0000 (21:01 +0000)]
Merge "Use META_LEFT to launch the ASSIST behavior."
Michael Wright [Wed, 4 Jun 2014 02:19:48 +0000 (19:19 -0700)]
Use META_LEFT to launch the ASSIST behavior.
Also, claim any key combo'd with META_LEFT for the system.
Change-Id: I29892e31ed40f04d1dd3cf173551237ffb3702ca
Alan Viverette [Thu, 5 Jun 2014 21:00:32 +0000 (21:00 +0000)]
am
3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
* commit '
3966c9604e55c9183a6d1ba8b3540add3be4434f':
Add defaults for caption colors and edge type
Justin Koh [Thu, 5 Jun 2014 20:59:37 +0000 (20:59 +0000)]
am
910aff5f: (-s ours) am
89b6bf5a: DO NOT MERGE Readd removal of notification listener limit on posting
* commit '
910aff5f6b5ba9611db17b493f0a5fdb9c6d746e':
DO NOT MERGE Readd removal of notification listener limit on posting
Justin Koh [Thu, 5 Jun 2014 20:56:19 +0000 (20:56 +0000)]
am
89b6bf5a: DO NOT MERGE Readd removal of notification listener limit on posting
* commit '
89b6bf5a118322d923cb9349515f06e32003c6ef':
DO NOT MERGE Readd removal of notification listener limit on posting
Justin Koh [Thu, 5 Jun 2014 20:50:58 +0000 (13:50 -0700)]
DO NOT MERGE Readd removal of notification listener limit on posting
Listener packages are allowed to post > 50 notifications
This reverts commit
500a6b0ca68aaad6140b5af2dae94349be9f7aeb.
Alan Viverette [Thu, 5 Jun 2014 20:37:21 +0000 (20:37 +0000)]
Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
Justin Koh [Thu, 5 Jun 2014 20:09:56 +0000 (20:09 +0000)]
am
c7a5d4a9: am
8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
* commit '
c7a5d4a920a7cd865da93ba56c35403c43c69971':
Revert "Add check to allow notification listener packages to post >50 notifications"
Winson Chung [Thu, 5 Jun 2014 20:08:57 +0000 (20:08 +0000)]
am
16b5e60d: Merge "Fixing issue with broadcast being sent before boot completed." into lmp-preview-dev
* commit '
16b5e60d49ea952a86f71da479a980e37ea652cf':
Fixing issue with broadcast being sent before boot completed.
Raph Levien [Thu, 5 Jun 2014 20:08:57 +0000 (20:08 +0000)]
am
e0ebf19c: Merge "Support for context in Minikin shaping" into lmp-preview-dev
* commit '
e0ebf19cbfa60ba3eb0891d5e8416b70b212bc36':
Support for context in Minikin shaping
Raph Levien [Thu, 5 Jun 2014 20:08:56 +0000 (20:08 +0000)]
am
79fbad97: Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev
* commit '
79fbad97705d191f80d7af7e494ca4a5fed3a783':
Support for scaleX and skewX in Minikin
Raph Levien [Thu, 5 Jun 2014 20:08:55 +0000 (20:08 +0000)]
am
eb77dfe1: Merge "Fix broken macStyle flags on Roboto-MediumItalic" into lmp-preview-dev
* commit '
eb77dfe14d51243b78ac856b582d39cacc4cd9b9':
Fix broken macStyle flags on Roboto-MediumItalic
Matthew Williams [Thu, 5 Jun 2014 20:08:54 +0000 (20:08 +0000)]
am
1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
* commit '
1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
Add persistence of tasks for TaskManager & BatteryController
Justin Koh [Thu, 5 Jun 2014 20:05:08 +0000 (20:05 +0000)]
am
8200b667: Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
* commit '
8200b667ea75b7d5353343f9e2f22e33b373077e':
Revert "Add check to allow notification listener packages to post >50 notifications"
Winson Chung [Thu, 5 Jun 2014 20:04:40 +0000 (20:04 +0000)]
Merge "Fixing issue with broadcast being sent before boot completed." into lmp-preview-dev
Dan Sandler [Thu, 5 Jun 2014 20:04:36 +0000 (20:04 +0000)]
am
4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev
* commit '
4ccaa092d49deb84885b5daf2e6d6f1c745d56bf':
Don't show private notifications if a secure lockscreen is merely occluded.
Winson Chung [Thu, 5 Jun 2014 17:58:05 +0000 (10:58 -0700)]
Fixing issue with broadcast being sent before boot completed.
Bug:
15444478
Bug:
15109101
Change-Id: I0fd5d32761c84ff237bce8328f23907bbf12ee6a
Ihab Awad [Thu, 5 Jun 2014 19:59:53 +0000 (19:59 +0000)]
Merge "DO NOT MERGE. Implement connection error dialogs (1/4)"
Ihab Awad [Wed, 4 Jun 2014 01:40:45 +0000 (18:40 -0700)]
DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.
Bug:
15195720
Bug:
15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
(cherry picked from commit
976bfe497da31fa8322969648ffbe77898941d0c)
Raph Levien [Thu, 5 Jun 2014 19:37:08 +0000 (19:37 +0000)]
Merge "Support for context in Minikin shaping" into lmp-preview-dev
Raph Levien [Thu, 5 Jun 2014 19:26:33 +0000 (19:26 +0000)]
Merge "Support for scaleX and skewX in Minikin" into lmp-preview-dev
Raph Levien [Thu, 5 Jun 2014 19:26:21 +0000 (19:26 +0000)]
Merge "Fix broken macStyle flags on Roboto-MediumItalic" into lmp-preview-dev
Matthew Williams [Thu, 5 Jun 2014 19:15:25 +0000 (19:15 +0000)]
Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
Justin Koh [Thu, 5 Jun 2014 19:03:32 +0000 (19:03 +0000)]
Merge "Revert "Add check to allow notification listener packages to post >50 notifications"" into klp-modular-dev
Justin Koh [Thu, 5 Jun 2014 19:02:47 +0000 (19:02 +0000)]
Revert "Add check to allow notification listener packages to post >50 notifications"
Broke build.
This reverts commit
2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d.
Change-Id: I2fdf1de21b6598f85bbd94acef44e771b2df9f42
Elliott Hughes [Thu, 5 Jun 2014 18:40:49 +0000 (18:40 +0000)]
Merge "resolved conflicts for merge of
f8272896 to master"
Selim Cinek [Thu, 5 Jun 2014 18:38:49 +0000 (18:38 +0000)]
am
2d49b682: Merge "Fix PanelView over expanding behavior." into lmp-preview-dev
* commit '
2d49b682522cf8ec90bfd3e3fde468b44919ccae':
Fix PanelView over expanding behavior.
Elliott Hughes [Thu, 5 Jun 2014 18:35:53 +0000 (11:35 -0700)]
resolved conflicts for merge of
f8272896 to master
Change-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85
Dan Sandler [Thu, 5 Jun 2014 18:35:48 +0000 (18:35 +0000)]
Merge "Don't show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev
Elliott Hughes [Thu, 5 Jun 2014 18:29:24 +0000 (18:29 +0000)]
am
bd1949a4: am
b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."
* commit '
bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf':
[LP64] Fix access to MediaAlbumArt.
Matthew Williams [Sat, 17 May 2014 01:02:17 +0000 (18:02 -0700)]
Add persistence of tasks for TaskManager & BatteryController
Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.
Also added BatteryController logic.
Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
Elliott Hughes [Thu, 5 Jun 2014 18:19:16 +0000 (18:19 +0000)]
am
b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."
* commit '
b2842e72819b3eb724503290e9eaa7c50f65e45b':
[LP64] Fix access to MediaAlbumArt.
Justin Koh [Thu, 5 Jun 2014 18:14:01 +0000 (18:14 +0000)]
am
2304bf4c: am
2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
* commit '
2304bf4cd4e377994d80f55871fd31f82bb4f646':
Add check to allow notification listener packages to post >50 notifications
Justin Koh [Thu, 5 Jun 2014 18:10:01 +0000 (18:10 +0000)]
am
2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
* commit '
2be3d6f9361311c1d272965afcd602ae12c769af':
Add check to allow notification listener packages to post >50 notifications
Justin Koh [Thu, 5 Jun 2014 18:06:45 +0000 (18:06 +0000)]
Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
Jean-Michel Trivi [Thu, 5 Jun 2014 18:06:06 +0000 (18:06 +0000)]
Merge "AudioAttributes: parcelable, hide support for tags"
Elliott Hughes [Thu, 5 Jun 2014 18:02:04 +0000 (18:02 +0000)]
Merge "[LP64] Fix access to MediaAlbumArt."
Raph Levien [Wed, 4 Jun 2014 21:48:02 +0000 (14:48 -0700)]
Support for context in Minikin shaping
This patch uses the Minikin's new doLayout API that supports context,
and has some simple refactoring (pass css as string rather than setting
on the Layout object) to use this api.
Change-Id: I899474f81d377f3106e95ee3eb8d0fcc44c23ac2
Chris Wren [Thu, 5 Jun 2014 18:00:02 +0000 (18:00 +0000)]
am
413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
* commit '
413edd50540a7890949c5370d18f293f2e6f8841':
Disable the attention light on devices that do not have it.
Raph Levien [Sat, 31 May 2014 07:02:19 +0000 (00:02 -0700)]
Support for scaleX and skewX in Minikin
Passes textScaleX and textSkewX parameters, as well as paint flags from
the paint to Minikin, to support nontrivial scale and stretch of text.
Passing paint flags should minimize kerning artifacts arising from
mismatch of glyph rendering in layout and drawing.
Also, replaces unsafe snprintf to a fixed size buffer with a safe
version, which still avoids an allocation per layout operation.
This is part of the fix for bug
15186705 "Usability of the suggestion
strip in recent OTA's is severely reduced"
Change-Id: I79788383135836f4c21fb84405f36382627bf959
Selim Cinek [Thu, 5 Jun 2014 17:57:15 +0000 (17:57 +0000)]
Merge "Fix PanelView over expanding behavior." into lmp-preview-dev
Robin Lee [Thu, 5 Jun 2014 17:56:58 +0000 (17:56 +0000)]
am
7f993419: am
3c189e02: am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
7f99341950273f5284186ea2e59a22ac71241c30':
Add Environment call: get config dir for some user
Jorim Jaggi [Thu, 5 Jun 2014 15:25:40 +0000 (17:25 +0200)]
Fix PanelView over expanding behavior.
Fixes a bug that the panel height was wrongly calculated and lagging
one frame behind. Also fixes the animation when overscrolling and
then flinging the panel to collapse. In addition, the logic to handle
the over expanding is much cleaner and calculated in an absolut
manner (before, it was relative an really complicated to understand).
Bug:
14487435
Change-Id: If8dbb3e063ef63f51f6dac0ae5bf276480514103
Robin Lee [Thu, 5 Jun 2014 17:53:25 +0000 (17:53 +0000)]
am
3c189e02: am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
3c189e02e42fba9d5be2c4f68f76620bae33618e':
Add Environment call: get config dir for some user
Hui Lu [Thu, 5 Jun 2014 17:42:17 +0000 (17:42 +0000)]
am
26f40cc3: am
61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '
26f40cc36dc869fc8de3bf4c97de57aae0d626ca':
Add interface name for proxy network type.
Hui Lu [Thu, 5 Jun 2014 17:39:09 +0000 (17:39 +0000)]
am
61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '
61c0f547339ec870d42b15e84f9628631308f22f':
Add interface name for proxy network type.
Elliott Hughes [Thu, 5 Jun 2014 17:38:30 +0000 (10:38 -0700)]
[LP64] Fix access to MediaAlbumArt.
The mSize field is a uint32_t, not a long.
Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
Hui Lu [Thu, 5 Jun 2014 17:36:02 +0000 (17:36 +0000)]
Merge "Add interface name for proxy network type." into klp-modular-dev
Kenny Guy [Thu, 5 Jun 2014 17:29:40 +0000 (17:29 +0000)]
Merge "Fix bug with sending intents to correct user for device admin."
Robin Lee [Thu, 5 Jun 2014 17:26:29 +0000 (17:26 +0000)]
am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
271251d739db12838d1521bcf885b4943e9b00b1':
Add Environment call: get config dir for some user
Raph Levien [Thu, 5 Jun 2014 06:12:48 +0000 (23:12 -0700)]
Fix broken macStyle flags on Roboto-MediumItalic
This is a fix for bug
15432929 "Seeing italics instead of bold"
The Roboto-MediumItalic font had macStyle of 3 (bold italic), which
caused it to be selected as a best match for a request of just bold.
This patch changes it to 2 (italic), leaving all else unchanged.
Change-Id: Ic28934904e11ca34cfede8429520d2d87aaf84cd
Robin Lee [Thu, 5 Jun 2014 17:16:51 +0000 (17:16 +0000)]
Merge "Add Environment call: get config dir for some user"
Kenny Guy [Thu, 5 Jun 2014 15:51:24 +0000 (16:51 +0100)]
Fix bug with sending intents to correct user for device admin.
Password change intents etc. were always being sent to
owner rather than user the device admin was installed for.
Also add TODO to not assume profile parent is OWNER.
Bug:
15442331
Change-Id: I7e58069bc4a6ab94f038ae1b80c044d666986318
Hui Lu [Tue, 3 Jun 2014 19:50:30 +0000 (15:50 -0400)]
Add interface name for proxy network type.
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b
Bug:
15320910
Chris Wren [Thu, 5 Jun 2014 16:51:29 +0000 (16:51 +0000)]
am
89dcfe66: Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev
* commit '
89dcfe66c9101a4124d121d1c8df98e5cd8b7798':
A notification that emerges from Zen Mode interception should beep.
Chris Wren [Thu, 5 Jun 2014 16:49:13 +0000 (16:49 +0000)]
Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
Eric Laurent [Thu, 5 Jun 2014 16:47:45 +0000 (16:47 +0000)]
am
e637e614: Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev
* commit '
e637e614b95eb8bb5b4d69ad5ab89ce92e4b5a29':
remove debug log in AudioPortEventHandler.
Chris Wren [Thu, 5 Jun 2014 16:44:49 +0000 (16:44 +0000)]
Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev
Chris Wren [Wed, 4 Jun 2014 19:59:50 +0000 (15:59 -0400)]
Disable the attention light on devices that do not have it.
If the attention and notificaiton light are mapped to the same
physical LED, then pulsing the attention light can turn off the
notification light. See bug for detailed discussion.
Bug:
12900389
Change-Id: I2703af23f50ecc3e92140b9843aaf340d520bce5
Chris Wren [Tue, 3 Jun 2014 22:11:47 +0000 (18:11 -0400)]
A notification that emerges from Zen Mode interception should beep.
If a notificaiton emerges from Zen Mode due to a ranking
reconsideration (possibly because a long-running query resolved an
important person) then it should get the oportunity buzz, beep, blink,
and send accessibility events.
Save what we need to know about the old notificaiton record on the new
record so we don't have to hold onto it.
Bug:
15383458
Change-Id: I15c7834fef03ff6a676e78e9d2caae24f00720ef
Mike Lockwood [Thu, 5 Jun 2014 15:34:48 +0000 (15:34 +0000)]
Merge "UsbDebuggingManager: remove log spam when disconnecting USB"
Mike Lockwood [Thu, 5 Jun 2014 15:24:16 +0000 (08:24 -0700)]
UsbDebuggingManager: remove log spam when disconnecting USB
Bug:
15112047
Change-Id: Ia07895ee166fa87c88d0443f0745bc9384dac10c
Yorke Lee [Thu, 5 Jun 2014 15:21:22 +0000 (15:21 +0000)]
am
d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev
* commit '
d6138017d9d435b176dff424ff75c8e8ea298d06':
API changes per API review for contacts
Yohei Yukawa [Thu, 5 Jun 2014 15:20:53 +0000 (15:20 +0000)]
Merge "Trivial method renaming for notifyTextCommitted"
Eric Laurent [Thu, 5 Jun 2014 15:18:35 +0000 (15:18 +0000)]
Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev
Robin Lee [Mon, 28 Apr 2014 15:03:22 +0000 (16:03 +0100)]
Add Environment call: get config dir for some user
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.
Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
Kenny Guy [Thu, 5 Jun 2014 14:20:35 +0000 (14:20 +0000)]
Merge "Badge notification from managed profiles."
Adam Connors [Thu, 5 Jun 2014 14:10:24 +0000 (14:10 +0000)]
Merge "Fix build break (include current.txt)"
Adam Connors [Thu, 5 Jun 2014 14:07:53 +0000 (15:07 +0100)]
Fix build break (include current.txt)
I forgot to commit this... sorry.
Change-Id: I5efca4d9447f1792a095dd64210a124c29e6a917
Yohei Yukawa [Thu, 5 Jun 2014 07:16:18 +0000 (16:16 +0900)]
Trivial method renaming for notifyTextCommitted
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.
BUG:
7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
Selim Cinek [Thu, 5 Jun 2014 13:45:59 +0000 (13:45 +0000)]
am
995006df: Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
* commit '
995006dfe6e41c8d986c7c7af5bb02ff23e4429a':
Changed the default success color of the lockpatternview to white.
Ihab Awad [Thu, 5 Jun 2014 13:45:59 +0000 (13:45 +0000)]
am
4c0c5cf9: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev
* commit '
4c0c5cf919dac4708f631a29d7e7537b316e970f':
DO NOT MERGE. Implement connection error dialogs (1/4)
Selim Cinek [Thu, 5 Jun 2014 13:45:58 +0000 (13:45 +0000)]
am
71ea5814: Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
* commit '
71ea5814716a191b3ab2bc9045007865cbad3e34':
Changed the LockPatternView assets to quantum
Yorke Lee [Thu, 5 Jun 2014 13:43:34 +0000 (13:43 +0000)]
Merge "API changes per API review for contacts" into lmp-preview-dev
Adam Connors [Thu, 5 Jun 2014 13:07:12 +0000 (13:07 +0000)]
Merge "API Review: rename FEATURE_MANAGEDPROFILES"
Adam Connors [Thu, 5 Jun 2014 11:20:15 +0000 (11:20 +0000)]
Merge "Allow system process to call getApplicationBlockedAsUser"
Adam Connors [Thu, 5 Jun 2014 11:13:03 +0000 (12:13 +0100)]
API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES
Bug:
15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
Adam Connors [Thu, 5 Jun 2014 09:36:01 +0000 (10:36 +0100)]
Allow system process to call getApplicationBlockedAsUser
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
Dan Sandler [Thu, 5 Jun 2014 09:47:47 +0000 (09:47 +0000)]
am
8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
* commit '
8c2079c2ce89bb7311f6db08f5f0d09e262d650f':
Platlogo: The icon now matches the activity.
Dan Sandler [Thu, 5 Jun 2014 04:58:02 +0000 (00:58 -0400)]
Don't show private notifications if a secure lockscreen is merely occluded.
Bug:
15430088
Change-Id: I27187216462b5bb7d52c3f85b9444348138fd9ea
Selim Cinek [Thu, 5 Jun 2014 05:36:22 +0000 (05:36 +0000)]
Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
Selim Cinek [Thu, 5 Jun 2014 05:25:01 +0000 (07:25 +0200)]
Changed the default success color of the lockpatternview to white.
Since it was distracting when unlocking
Bug:
13735707
Change-Id: I6b9c5baa22dc5c102f36bdf9a99390c5dd1690ba
Ihab Awad [Thu, 5 Jun 2014 05:24:38 +0000 (05:24 +0000)]
Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev
Selim Cinek [Thu, 5 Jun 2014 05:03:10 +0000 (05:03 +0000)]
Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
Selim Cinek [Wed, 4 Jun 2014 14:06:51 +0000 (16:06 +0200)]
Changed the LockPatternView assets to quantum
Bug:
13735707
Change-Id: Id999adbd8a4aeb3ca91fcb9957ec38ec75ff91b0
Justin Koh [Wed, 4 Jun 2014 20:57:49 +0000 (13:57 -0700)]
Add check to allow notification listener packages to post >50 notifications
Bug:
13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
Craig Mautner [Thu, 5 Jun 2014 03:59:13 +0000 (20:59 -0700)]
Merge commit '
21483b9f' into manualmerge
Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
Craig Mautner [Thu, 5 Jun 2014 03:31:06 +0000 (03:31 +0000)]
am
e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev
* commit '
e34fcf8ff9a023641505a8decdeb1b77232d8a16':
Add callback when ActivityView activities complete
Craig Mautner [Thu, 5 Jun 2014 03:28:21 +0000 (03:28 +0000)]
Merge "Add callback when ActivityView activities complete" into klp-modular-dev
Eric Laurent [Thu, 5 Jun 2014 03:09:13 +0000 (20:09 -0700)]
remove debug log in AudioPortEventHandler.
Bug:
14815883.
Change-Id: Ib5076fcfe8a36d1dd772b072fdf3400e57acc61c
Eino-Ville Talvala [Thu, 5 Jun 2014 02:30:08 +0000 (02:30 +0000)]
am
4b1b33ef: Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev
* commit '
4b1b33eff0eabd17f1078d55188b40e9a27d047a':
Camera2: Invoke onError callbacks for failure to open
Dan Sandler [Thu, 5 Jun 2014 02:26:40 +0000 (02:26 +0000)]
Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
Jungshik Jang [Wed, 28 May 2014 08:58:58 +0000 (17:58 +0900)]
Implement hotplug detection sequence.
Hotplug detection is periodic operation to detect new/removed device.
In case of directly connected device fires hotplug devices
but remote devices which are plugged in hdmi switch may not
report their existence.
Hotplug action polls all devices in regular base; 5s for
system audio (only when it's active) 15s for others.
Change-Id: I77c308ecfd5d6bf92f306923fa5ac9eabdad4127
Alan Viverette [Thu, 5 Jun 2014 01:35:42 +0000 (18:35 -0700)]
Add defaults for caption colors and edge type
BUG:
8151470
Change-Id: I4d7b75bf647aeded77b4000cdcd37e9ace46a374
Jungshik Jang [Thu, 5 Jun 2014 01:24:02 +0000 (01:24 +0000)]
Merge "Refactor HdmiCecLocalDevice and logical address allocation logic."
Jungshik Jang [Tue, 3 Jun 2014 07:22:30 +0000 (16:22 +0900)]
Refactor HdmiCecLocalDevice and logical address allocation logic.
1. Factor out logical allocation logic to HdmiControlService.
2. Contains a reference to HdmiControlService rather than
HdmiCecController so that it enables to access service's logic
directly.
3. Move launch device discovery logic to HdmiCecLocalDeviceTv.
Change-Id: Ic97b4d51311a3c18f6d586c2245cac410cbd370e
Yorke Lee [Thu, 5 Jun 2014 01:01:46 +0000 (18:01 -0700)]
API changes per API review for contacts
* Improve documentation for REMOVE_DUPLICATE_ENTRIES
* Hide android.provider.ContactsContract.PinnedPositions, it will be
reworked and improved for L.
* Hide android.provider.ContactsContract.Preferences - we will rework
the various apps that are relying on this to use their own preferences
instead
* Remove inheritance of hidden interfaces in android.provider.Contacts
Bug:
15430304
Change-Id: I0f96e8a506083df21023f9b95655f0ce5244bdce
Deepanshu Gupta [Thu, 5 Jun 2014 01:10:44 +0000 (01:10 +0000)]
Eino-Ville Talvala [Thu, 5 Jun 2014 01:08:53 +0000 (01:08 +0000)]
Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev
Craig Mautner [Mon, 2 Jun 2014 22:06:40 +0000 (15:06 -0700)]
Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.
Fixes bug
15330616.
Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85