Chris Craik
b38934179c
am fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev
...
* commit 'fc1bf228ec27ca3a1fd2d570650a003f0045a64b':
Don't cast shadows from gradients with transparent parts
2014-08-19 19:29:07 +00:00
Jesse Hall
bebaa8c470
am d30eb64f: am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit 'd30eb64f61f1cacb1bfca1be512bc1d208206f08':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 19:16:50 +00:00
Shishir Agrawal
426fb16355
am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
...
* commit '0ec424c13d07bc59632bc85985ab0b5fd8ae0dec':
Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
2014-08-19 19:16:45 +00:00
Jesse Hall
efa5a01dc6
am 87978406: (-s ours) am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit '87978406b405cafc773703b7c849e372339527b8':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 19:12:08 +00:00
Jae Seo
47b9e4afc9
TIF: Add the video frame rate information to TvTrackInfo
...
Bug: 16187997
Change-Id: I25d5489e42502fa8f2537aadc205bb4203980fb2
2014-08-19 12:02:16 -07:00
Igor Murashkin
7940bde7eb
am 77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
...
* commit '77af33f81d2cbef1580a103c4efda6829f20c7e1':
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
2014-08-19 18:42:38 +00:00
Igor Murashkin
32052c01ff
am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
...
* commit '3b690f25d97907486a4fcf9f8c05a89bf25f23fd':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
2014-08-19 18:42:35 +00:00
Lajos Molnar
2f9aec66ee
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
2014-08-19 18:14:43 +00:00
Lajos Molnar
d504ab14d2
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
2014-08-19 11:08:08 -07:00
RoboErik
c5daf4228d
am 368325e4: Update MediaSession APIs for council feedback
...
* commit '368325e4ea45f51b28a09c78a7f0f3c1f052443f':
Update MediaSession APIs for council feedback
2014-08-19 17:23:56 +00:00
RoboErik
a66c40bf6e
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
2014-08-19 17:12:42 +00:00
Chris Craik
84044a3ecf
am fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev
...
* commit 'fb52669c01cb31164801e2320f9d3fc954b3f16b':
Respect round rect clip when determining op opaqueness
2014-08-19 16:59:09 +00:00
George Mount
c3a0b0a998
am 2d0cb7d1: Add a way to get Transitions from a TransitionSet.
...
* commit '2d0cb7d16f3c280c1c4b317cbfc96a5bb9f3bc94':
Add a way to get Transitions from a TransitionSet.
2014-08-19 16:51:15 +00:00
John Spurlock
abd87a1e2e
am a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev
...
* commit 'a21bd779ae24cbb08ae95361f13006b09e7e273a':
Revert workaround for network limit dialog.
2014-08-19 16:51:11 +00:00
George Mount
7f15164ecb
Add a way to get Transitions from a TransitionSet.
...
Bug 17113732
Change-Id: I0a157a59448e66560ba2252709971131c5dea401
2014-08-19 16:43:06 +00:00
Tyler Gunn
f7252e1a97
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)
2014-08-19 16:35:16 +00:00
Nicolas Prevot
7d01ea71d9
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.
2014-08-19 16:35:12 +00:00
Jesse Hall
87978406b4
am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
...
* commit 'df7af46a4c034410dd1544415c3dcf19edef82e3':
VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 16:31:17 +00:00
Jesse Hall
df7af46a4c
VirtualDisplayAdapter: Set the transaction surface even if NULL
...
Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
2014-08-19 09:18:40 -07:00
Nicolas Prevot
ec4bb45a8c
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
2014-08-19 17:09:09 +01:00
Selim Cinek
7e0ced5a31
am 29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev
...
* commit '29b3fee4e4f04ca023ee1302be47507e5635e921':
Removed bugreport tile code from Quick settings
2014-08-19 15:51:17 +00:00
Ihab Awad
9e4329ea0b
Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev
2014-08-19 15:47:37 +00:00
Ihab Awad
6107bab041
ConnectionService API has only one completed callback (1/3)
...
Refactor ConnectionService API so it has only one "completed"
callback, and connection state and failure codes indicates what
happened. Previous design where we had separate callbacks for failure,
cancellation and success was error prone because it was easy to forget
to implement one of them.
Bug: 16993846
Bug: 17070939
Change-Id: I84bf5d041cf78193ccf80db201b08db3b7014830
2014-08-19 10:51:00 -07:00
Chris Craik
13600f9ed4
Merge "Don't cast shadows from gradients with transparent parts" into lmp-dev
2014-08-19 15:47:37 +00:00
Chris Craik
c49e3ce6c6
Don't cast shadows from gradients with transparent parts
...
bug:17070982
Change-Id: I607dd3c9397845fce53b7f097ec0b57246077ea1
2014-08-19 11:11:11 -07:00
Chris Craik
f1381debec
Merge "Respect round rect clip when determining op opaqueness" into lmp-dev
2014-08-19 15:47:37 +00:00
John Spurlock
5c2ba23348
am 633c8237: Data usage limit strings + icon changes.
...
* commit '633c82379f655f834b71edb8abfec4f113424ada':
Data usage limit strings + icon changes.
2014-08-19 14:36:29 +00:00
John Spurlock
3eccbc270d
Data usage limit strings + icon changes.
...
- Change notification icon + text.
- Change QS detail overlimit title.
Bug:17042440
Change-Id: I45ebd82c3e676ec265f29b778605444ae4a1c4f1
2014-08-19 10:25:47 -04:00
John Spurlock
a499545290
am 725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev
...
* commit '725ea467ecd30ea5391805cf628b7bf1a86e63e4':
QS: Enhance color inversion tile usage detection.
2014-08-19 12:37:24 +00:00
Kenny Guy
ae673b7a1d
am 181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev
...
* commit '181fc408746b5a6a1990670ce006984774d0c1a5':
First part of renaming methods in LauncherApps.
2014-08-19 11:15:00 +00:00
Selim Cinek
0a5d87d650
am a5b81bec: Properly announcing the shade state for accessibility
...
* commit 'a5b81bec0e80ebfa231db1fc59f268a1f628a2b6':
Properly announcing the shade state for accessibility
2014-08-19 10:53:16 +00:00
Selim Cinek
6db08d1d11
am 279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev
...
* commit '279ce37b8294a653af0f6c635aff97fcd6a9a06a':
Fixed accessibility issues with quick settings
2014-08-19 10:53:11 +00:00
Selim Cinek
90c946583d
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
2014-08-19 10:48:56 +00:00
Esteban Talavera
3d16ad8aba
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
2014-08-19 09:56:21 +00:00
Ji-Hwan Lee
69645b10cd
am 1becc968: TIF: Call setMain(false) when session is released.
...
* commit '1becc968b47b82d2bea2ee83f2fb91dcda07e54e':
TIF: Call setMain(false) when session is released.
2014-08-19 06:23:19 +00:00
Ji-Hwan Lee
15c56aac98
TIF: Call setMain(false) when session is released.
...
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.
Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
2014-08-19 06:11:04 +00:00
Jinsuk Kim
b79ad0a3d7
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
2014-08-19 06:07:54 +00:00
Andrew Solovay
7cb2570a0a
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().
2014-08-19 05:59:55 +00:00
Andrew Solovay
fc6b01f463
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().
2014-08-19 05:52:57 +00:00
Jaewan Kim
8b1b8a302c
am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev
...
* commit 'ecd7d762a47ad1a387db26c2b9ddc59ab310f00f':
Fix NPE when passing null TvContentRating
2014-08-19 05:03:07 +00:00
Dongwon Kang
2a9af92880
am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev
...
* commit '7c2ae2177f1163a80822535adbf013edeb615ad2':
TIF: verify the hardware input ID from getHardwareInputId().
2014-08-19 04:10:41 +00:00
Jon Miranda
19d65ad016
am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev
...
* commit 'b315ca55a9da8857ebe15547f59b333891cf7ed4':
Exposes style and theme data, adds developer option.
2014-08-19 02:58:25 +00:00
Chris Craik
2262abbd16
Respect round rect clip when determining op opaqueness
...
bug:17115570
Change-Id: I30184b4678d333b5d222af8b61daa07a5e865cab
2014-08-18 19:55:36 -07:00
RoboErik
47a7d247ef
Merge "Api updates to MediaSession components" into lmp-dev
2014-08-19 02:43:23 +00:00
RoboErik
d2b8c947dd
Api updates to MediaSession components
...
-renames get/setBufferPosition to get/setBufferedPosition
-renames getLaunchActivity to getSessionActivity
-adds doc link to setVolumeTo flags param
-renames setLaunchActivity to setSessionActivity
-hides setMediaRouter
-moves PLAYBACK_TYPE_ constants to MediaController.AudioInfo
-adds addOnActiveSessionsChangedListener version with a handler parameter
-renames AudioInfo to PlaybackInfo
bug:17114404
Change-Id: I0fbfe4eb979cb2af98e3f13095c654bb131f7ae5
2014-08-20 10:05:06 -07:00
Igor Murashkin
3a6eba01c4
Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
...
Return empty array since no implementation-defined sizes are supported
Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
2014-08-19 10:51:30 -07:00
Wenchao Tong
36ecb30b87
Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev
2014-08-19 02:43:23 +00:00
Wenchao Tong
4d11492071
Annotate @SystemApi on some WifiManager methods.
...
Bug: 17112931
Change-Id: I5980bc46bc1f16316caecd7fcc6cd771b8ca6cdf
2014-08-19 09:42:41 -07:00
Deepanshu Gupta
486ed3da0a
Merge "Fix "@null" resource values in LayoutLib." into lmp-dev
2014-08-19 02:43:23 +00:00