git.osdn.net Git - android-x86/frameworks-base.git/log

Igor Murashkin [Tue, 19 Aug 2014 18:59:35 +0000 (18:59 +0000)]

am 6416f7d2: am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev

* commit '6416f7d221b462542f5df0128201b1da6b206933':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates

commit | commitdiff | tree

Igor Murashkin [Tue, 19 Aug 2014 18:54:43 +0000 (18:54 +0000)]

am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev

* commit '5e27ea673ae91907f7b2316a6008db629356178c':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates

commit | commitdiff | tree

Igor Murashkin [Tue, 19 Aug 2014 18:42:35 +0000 (18:42 +0000)]

am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev

* commit '3b690f25d97907486a4fcf9f8c05a89bf25f23fd':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates

commit | commitdiff | tree

Lajos Molnar [Tue, 19 Aug 2014 18:37:27 +0000 (18:37 +0000)]

am d1edc10f: am 321d7e4f: am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme

* commit 'd1edc10fd69dd9c2f759aaa074472c39af6a2812':
media.MediaPlayer: don't check file-existence for URI-s with scheme

commit | commitdiff | tree

Lajos Molnar [Tue, 19 Aug 2014 18:25:58 +0000 (18:25 +0000)]

am 321d7e4f: am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme

* commit '321d7e4fa0a5d4ac377de7e3bb808b6eb424d4a7':
media.MediaPlayer: don't check file-existence for URI-s with scheme

commit | commitdiff | tree

Lajos Molnar [Tue, 19 Aug 2014 18:14:43 +0000 (18:14 +0000)]

am d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme

* commit 'd127a4ebe9cbd96dfe4879d969c4de0feedd4717':
media.MediaPlayer: don't check file-existence for URI-s with scheme

commit | commitdiff | tree

Lajos Molnar [Mon, 18 Aug 2014 21:26:55 +0000 (14:26 -0700)]

media.MediaPlayer: don't check file-existence for URI-s with scheme

setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).

Bug: 17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e

commit | commitdiff | tree

RoboErik [Tue, 19 Aug 2014 17:43:25 +0000 (17:43 +0000)]

am c6c011af: am eb81b54a: am 368325e4: Update MediaSession APIs for council feedback

* commit 'c6c011afb4867fadbc1f556c73e4bdfcf6929c4c':
Update MediaSession APIs for council feedback

commit | commitdiff | tree

Chris Craik [Tue, 19 Aug 2014 17:37:58 +0000 (17:37 +0000)]

am aec1eb59: am 21b3486a: am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev

* commit 'aec1eb59be0af6afc9e5c11aaf29a6635ad95dba':
Respect round rect clip when determining op opaqueness

commit | commitdiff | tree

RoboErik [Tue, 19 Aug 2014 17:32:58 +0000 (17:32 +0000)]

am eb81b54a: am 368325e4: Update MediaSession APIs for council feedback

* commit 'eb81b54aff12acaa0a77666c2f28dd3e7734902a':
Update MediaSession APIs for council feedback

commit | commitdiff | tree

George Mount [Tue, 19 Aug 2014 17:30:24 +0000 (17:30 +0000)]

am c2be2d14: am 5bc2737b: am 2d0cb7d1: Add a way to get Transitions from a TransitionSet.

* commit 'c2be2d1432b540f64b3d735bb790708a2a64800d':
Add a way to get Transitions from a TransitionSet.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 17:30:20 +0000 (17:30 +0000)]

am a582dbdd: am 575e927a: am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev

* commit 'a582dbdd2fb930573bf4b71ae8735513fe084f4c':
Revert workaround for network limit dialog.

commit | commitdiff | tree

RoboErik [Tue, 19 Aug 2014 17:23:56 +0000 (17:23 +0000)]

am 368325e4: Update MediaSession APIs for council feedback

* commit '368325e4ea45f51b28a09c78a7f0f3c1f052443f':
Update MediaSession APIs for council feedback

commit | commitdiff | tree

RoboErik [Fri, 15 Aug 2014 22:21:41 +0000 (15:21 -0700)]

Update MediaSession APIs for council feedback

-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item

bug:17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b

commit | commitdiff | tree

Chris Craik [Tue, 19 Aug 2014 17:10:57 +0000 (17:10 +0000)]

am 21b3486a: am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev

* commit '21b3486a5062cb398908a2e4ae2172c27d3efadf':
Respect round rect clip when determining op opaqueness

commit | commitdiff | tree

Chris Craik [Tue, 19 Aug 2014 16:59:09 +0000 (16:59 +0000)]

am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev

* commit 'fb52669c01cb31164801e2320f9d3fc954b3f16b':
Respect round rect clip when determining op opaqueness

commit | commitdiff | tree

George Mount [Tue, 19 Aug 2014 16:58:32 +0000 (16:58 +0000)]

am 5bc2737b: am 2d0cb7d1: Add a way to get Transitions from a TransitionSet.

* commit '5bc2737b2a98da670e7e8786c43df916a45f7eb2':
Add a way to get Transitions from a TransitionSet.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 16:58:27 +0000 (16:58 +0000)]

am 575e927a: am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev

* commit '575e927a4e25aad9e40959b153664dbf2d5df574':
Revert workaround for network limit dialog.

commit | commitdiff | tree

Tyler Gunn [Tue, 19 Aug 2014 16:52:26 +0000 (16:52 +0000)]

am e4df8728: am 084c98b4: am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev

* commit 'e4df8728312f9d289c096ba804816e3091c2a125':
Exposing in-call API to other implementing classes. (1/4)

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 Aug 2014 16:52:22 +0000 (16:52 +0000)]

am 589f0afe: am 07e5e66c: am 0587c834: When notify uri changes, changing the way we retrieve the userId.

* commit '589f0afe055b39ea4623385656eff6f8cf1f9b8f':
When notify uri changes, changing the way we retrieve the userId.

commit | commitdiff | tree

George Mount [Tue, 19 Aug 2014 16:51:15 +0000 (16:51 +0000)]

am 2d0cb7d1: Add a way to get Transitions from a TransitionSet.

* commit '2d0cb7d16f3c280c1c4b317cbfc96a5bb9f3bc94':
Add a way to get Transitions from a TransitionSet.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 16:51:11 +0000 (16:51 +0000)]

am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev

* commit 'a21bd779ae24cbb08ae95361f13006b09e7e273a':
Revert workaround for network limit dialog.

commit | commitdiff | tree

Tyler Gunn [Tue, 19 Aug 2014 16:44:00 +0000 (16:44 +0000)]

am 084c98b4: am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev

* commit '084c98b407e30b044df1be08693c92c9284db31d':
Exposing in-call API to other implementing classes. (1/4)

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 Aug 2014 16:43:56 +0000 (16:43 +0000)]

am 07e5e66c: am 0587c834: When notify uri changes, changing the way we retrieve the userId.

* commit '07e5e66cccfe6c442d7476525ea6a73669ca84d2':
When notify uri changes, changing the way we retrieve the userId.

commit | commitdiff | tree

George Mount [Mon, 18 Aug 2014 23:24:21 +0000 (16:24 -0700)]

Add a way to get Transitions from a TransitionSet.

Bug 17113732

Change-Id: I0a157a59448e66560ba2252709971131c5dea401

commit | commitdiff | tree

Tyler Gunn [Tue, 19 Aug 2014 16:35:16 +0000 (16:35 +0000)]

am d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev

* commit 'd324e32f6643f9630fdc2dc6d88b6bf6e771886e':
Exposing in-call API to other implementing classes. (1/4)

commit | commitdiff | tree

Nicolas Prevot [Tue, 19 Aug 2014 16:35:12 +0000 (16:35 +0000)]

am 0587c834: When notify uri changes, changing the way we retrieve the userId.

* commit '0587c834eeb980687e46b13b9cdeae54e5cb06cd':
When notify uri changes, changing the way we retrieve the userId.

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 16:10:44 +0000 (16:10 +0000)]

am a815a8a5: am c7fafbe5: am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev

* commit 'a815a8a5f9294324fe08de8a4a60e408c8c2aa8f':
Removed bugreport tile code from Quick settings

commit | commitdiff | tree

Nicolas Prevot [Wed, 6 Aug 2014 11:38:57 +0000 (12:38 +0100)]

When notify uri changes, changing the way we retrieve the userId.

Changing from UserHandle.getCallingUserId() to UserHandle.myUserId().
This makes the DocumentProvider work across users.

BUG: 16126891

Change-Id: I8ede64f2087894bb85eff5286803cdebd57e7137

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 15:59:03 +0000 (15:59 +0000)]

am c7fafbe5: am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev

* commit 'c7fafbe5004b2c6d3fe47449823a81196d94e864':
Removed bugreport tile code from Quick settings

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 15:51:17 +0000 (15:51 +0000)]

am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev

* commit '29b3fee4e4f04ca023ee1302be47507e5635e921':
Removed bugreport tile code from Quick settings

commit | commitdiff | tree

Chris Craik [Tue, 19 Aug 2014 16:51:32 +0000 (16:51 +0000)]

Merge "Respect round rect clip when determining op opaqueness" into lmp-dev

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 14:54:49 +0000 (14:54 +0000)]

am 4c649118: am 10cae0ff: am 633c8237: Data usage limit strings + icon changes.

* commit '4c64911825bc7b837fc827b0fc49c9ed83a16bc2':
Data usage limit strings + icon changes.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 14:46:19 +0000 (14:46 +0000)]

am 10cae0ff: am 633c8237: Data usage limit strings + icon changes.

* commit '10cae0ff8ce116960470dc3d35bc84be4121d7be':
Data usage limit strings + icon changes.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 14:36:29 +0000 (14:36 +0000)]

am 633c8237: Data usage limit strings + icon changes.

* commit '633c82379f655f834b71edb8abfec4f113424ada':
Data usage limit strings + icon changes.

commit | commitdiff | tree

John Spurlock [Mon, 18 Aug 2014 15:35:36 +0000 (11:35 -0400)]

Data usage limit strings + icon changes.

- Change notification icon + text.
- Change QS detail overlimit title.

Bug:17042440
Change-Id: I45ebd82c3e676ec265f29b778605444ae4a1c4f1

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 13:43:43 +0000 (13:43 +0000)]

am b0f58a7c: am 86e86554: am 725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev

* commit 'b0f58a7c96a4a7ab01b2270ed4d71914ed5b190e':
QS: Enhance color inversion tile usage detection.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 13:33:35 +0000 (13:33 +0000)]

am 86e86554: am 725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev

* commit '86e86554065e29573130ec3019b284ff109749bc':
QS: Enhance color inversion tile usage detection.

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 12:37:24 +0000 (12:37 +0000)]

am 725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev

* commit '725ea467ecd30ea5391805cf628b7bf1a86e63e4':
QS: Enhance color inversion tile usage detection.

commit | commitdiff | tree

Kenny Guy [Tue, 19 Aug 2014 11:30:52 +0000 (11:30 +0000)]

am c50a86f2: am 74c1c9db: am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev

* commit 'c50a86f22df34a46df52dc93699c7d46c376e05b':
First part of renaming methods in LauncherApps.

commit | commitdiff | tree

Kenny Guy [Tue, 19 Aug 2014 11:23:06 +0000 (11:23 +0000)]

am 74c1c9db: am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev

* commit '74c1c9db0c20706a3eb571309bb7888a16495808':
First part of renaming methods in LauncherApps.

commit | commitdiff | tree

Kenny Guy [Tue, 19 Aug 2014 11:15:00 +0000 (11:15 +0000)]

am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev

* commit '181fc408746b5a6a1990670ce006984774d0c1a5':
First part of renaming methods in LauncherApps.

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 11:08:24 +0000 (11:08 +0000)]

am fcec3974: am ce6a604d: am a5b81bec: Properly announcing the shade state for accessibility

* commit 'fcec3974d2f8ae80dd10a678b6bed48e0be366aa':
Properly announcing the shade state for accessibility

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 11:08:18 +0000 (11:08 +0000)]

am 42878668: am df75f2f2: am 279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev

* commit '428786688c63a15beb37fff6047a32f4fb6a880c':
Fixed accessibility issues with quick settings

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 11:01:03 +0000 (11:01 +0000)]

am ce6a604d: am a5b81bec: Properly announcing the shade state for accessibility

* commit 'ce6a604d7dfa28cc2a222e4c1de9b41c55119e64':
Properly announcing the shade state for accessibility

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 11:00:49 +0000 (11:00 +0000)]

am df75f2f2: am 279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev

* commit 'df75f2f2e12621017cff7b23e0245ffc95107b04':
Fixed accessibility issues with quick settings

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 10:53:16 +0000 (10:53 +0000)]

am a5b81bec: Properly announcing the shade state for accessibility

* commit 'a5b81bec0e80ebfa231db1fc59f268a1f628a2b6':
Properly announcing the shade state for accessibility

commit | commitdiff | tree

Selim Cinek [Tue, 19 Aug 2014 10:53:11 +0000 (10:53 +0000)]

am 279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev

* commit '279ce37b8294a653af0f6c635aff97fcd6a9a06a':
Fixed accessibility issues with quick settings

commit | commitdiff | tree

Selim Cinek [Mon, 18 Aug 2014 14:46:22 +0000 (16:46 +0200)]

Properly announcing the shade state for accessibility

When we are entering / leaving quicksettings, accessible
users are now informed about the state change.
Also fixed a bug where the lockscreen was called notification
shade.

Bug: 15696654
Change-Id: I39d8ad3367c424ec5f9a3795be46d4785a19bbee

commit | commitdiff | tree

Esteban Talavera [Tue, 19 Aug 2014 10:10:44 +0000 (10:10 +0000)]

am 257adcbb: am c3f863aa: am 5cf90bd9: Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev

* commit '257adcbb23634e458e06a452795170f24a5fd7da':
Add cross profile intent in order after intent filter resolution

commit | commitdiff | tree

Esteban Talavera [Tue, 19 Aug 2014 10:04:01 +0000 (10:04 +0000)]

am c3f863aa: am 5cf90bd9: Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev

* commit 'c3f863aa4158868ae493aeea20578b9539b9c148':
Add cross profile intent in order after intent filter resolution

commit | commitdiff | tree

Esteban Talavera [Tue, 19 Aug 2014 09:56:21 +0000 (09:56 +0000)]

am 5cf90bd9: Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev

* commit '5cf90bd9d15ac27b0fc26007d8f50abed0913d4a':
Add cross profile intent in order after intent filter resolution

commit | commitdiff | tree

Ji-Hwan Lee [Tue, 19 Aug 2014 07:23:13 +0000 (07:23 +0000)]

am 9de91850: am 2c315fef: am 1becc968: TIF: Call setMain(false) when session is released.

* commit '9de91850dc48e4a65749bda2c9f511e0876a56b0':
TIF: Call setMain(false) when session is released.

commit | commitdiff | tree

Jinsuk Kim [Tue, 19 Aug 2014 07:23:08 +0000 (07:23 +0000)]

am c5507a98: am 41869802: am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev

* commit 'c5507a9834944a25383b251d2f608e0bcbecdb19':
CEC: Invoke events listener upon MHL device state change

commit | commitdiff | tree

Andrew Solovay [Tue, 19 Aug 2014 07:23:03 +0000 (07:23 +0000)]

am e6e509a5: am 4d2a4062: am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

* commit 'e6e509a515766058ccf0aeb6d0fdf6839e0b0fdd':
docs: Documented new fields returned by getSkuDetails().

commit | commitdiff | tree

Ji-Hwan Lee [Tue, 19 Aug 2014 06:31:13 +0000 (06:31 +0000)]

am 2c315fef: am 1becc968: TIF: Call setMain(false) when session is released.

* commit '2c315fefd86f05f98180890aaa041c25b0fe5715':
TIF: Call setMain(false) when session is released.

commit | commitdiff | tree

Ji-Hwan Lee [Tue, 19 Aug 2014 06:23:19 +0000 (06:23 +0000)]

am 1becc968: TIF: Call setMain(false) when session is released.

* commit '1becc968b47b82d2bea2ee83f2fb91dcda07e54e':
TIF: Call setMain(false) when session is released.

commit | commitdiff | tree

Jinsuk Kim [Tue, 19 Aug 2014 06:15:40 +0000 (06:15 +0000)]

am 41869802: am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev

* commit '418698026e0a5303dc588c99efa64e3a9e401d47':
CEC: Invoke events listener upon MHL device state change

commit | commitdiff | tree

Andrew Solovay [Tue, 19 Aug 2014 06:11:16 +0000 (06:11 +0000)]

am 4d2a4062: am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

* commit '4d2a4062191b27845058e456dfe6ebb27ac66ace':
docs: Documented new fields returned by getSkuDetails().

commit | commitdiff | tree

Ji-Hwan Lee [Mon, 18 Aug 2014 13:01:55 +0000 (22:01 +0900)]

TIF: Call setMain(false) when session is released.

Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68

commit | commitdiff | tree

Jinsuk Kim [Tue, 19 Aug 2014 06:07:54 +0000 (06:07 +0000)]

am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev

* commit '53130b886f8baf2e7e75fdae8f71d90cc2b51929':
CEC: Invoke events listener upon MHL device state change

commit | commitdiff | tree

Andrew Solovay [Tue, 19 Aug 2014 05:59:55 +0000 (05:59 +0000)]

am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

* commit '338c46a18d5d7f2715248b4d512c9de559843864':
docs: Documented new fields returned by getSkuDetails().

commit | commitdiff | tree

Andrew Solovay [Tue, 19 Aug 2014 05:52:57 +0000 (05:52 +0000)]

am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
docs: Documented new fields returned by getSkuDetails().

commit | commitdiff | tree

Jaewan Kim [Tue, 19 Aug 2014 05:26:00 +0000 (05:26 +0000)]

am eab08670: am 8e04501a: am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev

* commit 'eab086704039d69aeddf6f65571932c9b2002e7f':
Fix NPE when passing null TvContentRating

commit | commitdiff | tree

Jaewan Kim [Tue, 19 Aug 2014 05:12:14 +0000 (05:12 +0000)]

am 8e04501a: am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev

* commit '8e04501a425dc4cf34833d4cd87655af30efe923':
Fix NPE when passing null TvContentRating

commit | commitdiff | tree

Jaewan Kim [Tue, 19 Aug 2014 05:03:07 +0000 (05:03 +0000)]

am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev

* commit 'ecd7d762a47ad1a387db26c2b9ddc59ab310f00f':
Fix NPE when passing null TvContentRating

commit | commitdiff | tree

Dongwon Kang [Tue, 19 Aug 2014 04:37:47 +0000 (04:37 +0000)]

am 2b2ef62e: am ad741c97: am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev

* commit '2b2ef62eb5bdc52793d7b6709cc8a744b30c2439':
TIF: verify the hardware input ID from getHardwareInputId().

commit | commitdiff | tree

Dongwon Kang [Tue, 19 Aug 2014 04:25:05 +0000 (04:25 +0000)]

am ad741c97: am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev

* commit 'ad741c9789f351ce2d05af4d4c0b85ebf2f2d7e0':
TIF: verify the hardware input ID from getHardwareInputId().

commit | commitdiff | tree

Dongwon Kang [Tue, 19 Aug 2014 04:10:41 +0000 (04:10 +0000)]

am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev

* commit '7c2ae2177f1163a80822535adbf013edeb615ad2':
TIF: verify the hardware input ID from getHardwareInputId().

commit | commitdiff | tree

Jon Miranda [Tue, 19 Aug 2014 03:20:40 +0000 (03:20 +0000)]

am 998d6e02: am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev

* commit '998d6e0267a2e2a242e0fff1049f5366f0f5e5c4':
Exposes style and theme data, adds developer option.

commit | commitdiff | tree

Jon Miranda [Tue, 19 Aug 2014 03:10:22 +0000 (03:10 +0000)]

am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev

* commit '4a5ac7db49117b5d14e82caca68405949eccfec5':
Exposes style and theme data, adds developer option.

commit | commitdiff | tree

Jungshik Jang [Tue, 19 Aug 2014 03:08:25 +0000 (03:08 +0000)]

am c7e6db4f: am 4e8baac5: am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev

* commit 'c7e6db4f770fda0d6acc5edc7d167d75d5e3adce':
Remove parameter field in HdmiCecKeycode.

commit | commitdiff | tree

Jon Miranda [Tue, 19 Aug 2014 02:58:25 +0000 (02:58 +0000)]

am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev

* commit 'b315ca55a9da8857ebe15547f59b333891cf7ed4':
Exposes style and theme data, adds developer option.

commit | commitdiff | tree

Chris Craik [Tue, 19 Aug 2014 02:55:36 +0000 (19:55 -0700)]

Respect round rect clip when determining op opaqueness

bug:17115570
Change-Id: I30184b4678d333b5d222af8b61daa07a5e865cab

commit | commitdiff | tree

Jungshik Jang [Tue, 19 Aug 2014 02:54:52 +0000 (02:54 +0000)]

am 4e8baac5: am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev

* commit '4e8baac5e77a54737bfad8180bc8ee832adf4b74':
Remove parameter field in HdmiCecKeycode.

commit | commitdiff | tree

Igor Murashkin [Tue, 19 Aug 2014 18:34:56 +0000 (18:34 +0000)]

Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev

commit | commitdiff | tree

Igor Murashkin [Tue, 19 Aug 2014 18:04:03 +0000 (11:04 -0700)]

camera2: (Legacy) Add control.sceneMode = DISABLED to templates

Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f

commit | commitdiff | tree

Jungshik Jang [Tue, 19 Aug 2014 02:33:49 +0000 (02:33 +0000)]

am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev

* commit 'd9910efb19df1b7aaebfc21d9f74977159d1b9f0':
Remove parameter field in HdmiCecKeycode.

commit | commitdiff | tree

Dongwon Kang [Tue, 19 Aug 2014 04:01:44 +0000 (04:01 +0000)]

Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 19 Aug 2014 01:53:48 +0000 (01:53 +0000)]

am 7720095a: am 59fef76d: am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev

* commit '7720095a41c77e2d133e4438a49ab3783359fdc6':
Fix issue #17114392: android.com.phone crashes - PackageManager code

commit | commitdiff | tree

Ji-Hwan Lee [Tue, 19 Aug 2014 01:53:43 +0000 (01:53 +0000)]

am 670e36e6: am ca1aebdf: am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev

* commit '670e36e68e1d2dfb6fd1913b787571488ac82dae':
TIF: Remove session state when hardware wrapper input crashes

commit | commitdiff | tree

Dianne Hackborn [Tue, 19 Aug 2014 01:41:19 +0000 (01:41 +0000)]

am 59fef76d: am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev

* commit '59fef76d149b05fe6886a223c36e662e6c47d41b':
Fix issue #17114392: android.com.phone crashes - PackageManager code

commit | commitdiff | tree

Ji-Hwan Lee [Tue, 19 Aug 2014 01:41:08 +0000 (01:41 +0000)]

am ca1aebdf: am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev

* commit 'ca1aebdf0c09a47e19c0526cd54fea07cdc8454f':
TIF: Remove session state when hardware wrapper input crashes

commit | commitdiff | tree

Dianne Hackborn [Tue, 19 Aug 2014 01:25:41 +0000 (01:25 +0000)]

am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev

* commit '0dafd7dceccde18aaa9eac05c77d035df979d88f':
Fix issue #17114392: android.com.phone crashes - PackageManager code

commit | commitdiff | tree

Ji-Hwan Lee [Tue, 19 Aug 2014 01:16:21 +0000 (01:16 +0000)]

am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev

* commit '16b1d44eea546f0ac4144f8cfbb847f9b880bfb6':
TIF: Remove session state when hardware wrapper input crashes

commit | commitdiff | tree

Dianne Hackborn [Tue, 19 Aug 2014 01:11:45 +0000 (01:11 +0000)]

am f6c80740: am 900eb151: am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev

* commit 'f6c807408a888ac7929d306badfd85ac3e2ceb45':
Temporary: raise overflow limit, print all wake locks.

commit | commitdiff | tree

Dianne Hackborn [Tue, 19 Aug 2014 01:03:04 +0000 (01:03 +0000)]

am 900eb151: am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev

* commit '900eb15179fa1cbf58231715c9af3f65115631c1':
Temporary: raise overflow limit, print all wake locks.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:57:30 +0000 (00:57 +0000)]

am 8271c770: am 9df4c42a: am e835a130: Merge "Persist Show IME option." into lmp-dev

* commit '8271c770de9ba35b9614f805613d16c881818f69':
Persist Show IME option.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:57:25 +0000 (00:57 +0000)]

am 089fb538: am 0cddd377: am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev

* commit '089fb5389809b8b03265668e7f30d756c0b675e0':
Update MenuItem#setShortcut docs

commit | commitdiff | tree

Dianne Hackborn [Tue, 19 Aug 2014 00:52:53 +0000 (00:52 +0000)]

am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev

* commit '8c1c48751db6c82826050f2bdde4c98c1aec8cd6':
Temporary: raise overflow limit, print all wake locks.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:48:56 +0000 (00:48 +0000)]

am 9df4c42a: am e835a130: Merge "Persist Show IME option." into lmp-dev

* commit '9df4c42aaada081a128671f2a3f6e06a5effa5cc':
Persist Show IME option.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:48:51 +0000 (00:48 +0000)]

am 0cddd377: am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev

* commit '0cddd377c9976b091457118a9a81b4a405958c2e':
Update MenuItem#setShortcut docs

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:48:21 +0000 (00:48 +0000)]

am 7814d9f0: am 4bbb811f: am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev

* commit '7814d9f05d202625280210269c89655013dce3de':
Add callbacks for MediaProjection start / stop.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:41:10 +0000 (00:41 +0000)]

am e835a130: Merge "Persist Show IME option." into lmp-dev

* commit 'e835a1305ff2b493f9488125c17314ff7bf34c22':
Persist Show IME option.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:41:06 +0000 (00:41 +0000)]

am 4bbb811f: am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev

* commit '4bbb811f0139849a7f0a9a0bc4cbc45daccf4d12':
Add callbacks for MediaProjection start / stop.

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:41:04 +0000 (00:41 +0000)]

am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev

* commit '6e1edc12a27ab92cd47ccdd588982ee629c0ae97':
Update MenuItem#setShortcut docs

commit | commitdiff | tree

Michael Wright [Tue, 19 Aug 2014 00:33:05 +0000 (00:33 +0000)]

am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev

* commit '504960cbdc1db1424b1a4181d3860a21a5b7d363':
Add callbacks for MediaProjection start / stop.

commit | commitdiff | tree

Svetoslav [Tue, 19 Aug 2014 00:17:45 +0000 (00:17 +0000)]

am ea7d9ffd: am 4c82c6d7: am 8dab46b4: Merge "Update the print spooler icon." into lmp-dev

* commit 'ea7d9ffdcfd57086dfff03a7151c7dc6fae4ea2f':
Update the print spooler icon.

commit | commitdiff | tree

Adam Lesinski [Tue, 19 Aug 2014 00:17:41 +0000 (00:17 +0000)]

am 1e188ad9: am aae8a25a: am 427964ed: Merge "Include build number in aapt version" into lmp-dev

* commit '1e188ad96a0f9fffcf17e1f5a2e843bc8c8884cb':
Include build number in aapt version

commit | commitdiff | tree

destradaa [Tue, 19 Aug 2014 00:17:36 +0000 (00:17 +0000)]

am fa1358ad: am 8e9d264e: am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev

* commit 'fa1358adff52baecd0c3e1aad933e5de614073a2':
Add @SystemApi annotation to Geofence Hardware types.