Jorim Jaggi
915f0ecaca
am 5499ea68: Merge "Visual refinements for lockscreen." into lmp-preview-dev
...
* commit '5499ea6810b98109d3004e8a9a1493e2b0c2654f':
Visual refinements for lockscreen.
2014-05-26 14:27:03 +00:00
Jorim Jaggi
dce826f715
am fc350fd0: Merge "Replace default user picture." into lmp-preview-dev
...
* commit 'fc350fd0ad9a232ab833bf5e7d85f48b8289504b':
Replace default user picture.
2014-05-26 14:26:55 +00:00
Jorim Jaggi
37e6562421
Merge "Visual refinements for lockscreen." into lmp-preview-dev
2014-05-26 14:23:38 +00:00
Jorim Jaggi
676c508744
am 45869607: Disable time and user switcher click targets when collapsed
...
* commit '458696075ccbcc6dc320a4a83712f222a440fbbc':
Disable time and user switcher click targets when collapsed
2014-05-26 14:22:55 +00:00
Jorim Jaggi
2a87343a8e
Merge "Replace default user picture." into lmp-preview-dev
2014-05-26 14:21:49 +00:00
Jorim Jaggi
125bd990e7
Replace default user picture.
...
Bug: 14842969
Change-Id: I4a46a2499ccf47e1bc13a179561d6ab271502ddb
2014-05-26 16:20:25 +02:00
Jorim Jaggi
5d6957ea79
Disable time and user switcher click targets when collapsed
...
Bug: 15125632
Change-Id: Ibdeeb47a696a574204b02b90ce6881cd78047738
2014-05-26 16:17:51 +02:00
Jorim Jaggi
316075a226
am 4d84e856: Merge "Make QS panel peek below the header." into lmp-preview-dev
...
* commit '4d84e85610ddc3eb593f85a1db12d8dfe8e15820':
Make QS panel peek below the header.
2014-05-26 14:16:42 +00:00
Selim Cinek
50e9c70828
am 655eeec6: Merge "Introduced overscrolling for the panel expansion" into lmp-preview-dev
...
* commit '655eeec6b70526378e85d50728c3ab42158131d9':
Introduced overscrolling for the panel expansion
2014-05-26 14:16:37 +00:00
Selim Cinek
726bb9725c
am 7aca28a2: Merge "Fixed the gap which could occur after the speedbumpview." into lmp-preview-dev
...
* commit '7aca28a28037b62c8341d91d8ac2b6056cfa8137':
Fixed the gap which could occur after the speedbumpview.
2014-05-26 14:16:32 +00:00
Jorim Jaggi
5b5cbd13d8
Merge "Make QS panel peek below the header." into lmp-preview-dev
2014-05-26 14:14:06 +00:00
Selim Cinek
161920fabb
Merge "Introduced overscrolling for the panel expansion" into lmp-preview-dev
2014-05-26 14:14:06 +00:00
Selim Cinek
0b176bbc10
Merge "Fixed the gap which could occur after the speedbumpview." into lmp-preview-dev
2014-05-26 14:13:05 +00:00
Jorim Jaggi
f62f2bbcf2
Make QS panel peek below the header.
...
Bug: 15210059
Change-Id: I84e45092b3c9c397da8b458dbaa136fd52e665a6
2014-05-26 16:11:14 +02:00
Adrian Roos
60e3422d90
am 373b672c: Merge "Remove unnecessary layout request from Keyguard" into lmp-preview-dev
...
* commit '373b672c291f945ef4e9146faed0c80aa1910f23':
Remove unnecessary layout request from Keyguard
2014-05-26 13:07:15 +00:00
Adrian Roos
b13d754898
Merge "Remove unnecessary layout request from Keyguard" into lmp-preview-dev
2014-05-26 13:03:09 +00:00
Yohann Roussel
f2fa9994ab
Merge "A test application for Art bug 14256107"
2014-05-26 12:26:21 +00:00
Selim Cinek
24120a5ccf
Introduced overscrolling for the panel expansion
...
Notifications now overscroll in a rubberbandy motion when expanding.
Bug: 14486987
Change-Id: I5ad47027adab10d6996e70f489e8c2550220e224
2014-05-26 10:09:14 +02:00
Selim Cinek
0045cc1bbd
Fixed the gap which could occur after the speedbumpview.
...
Bug: 15126099
Change-Id: Ia1724c123296313a706790d3a25ffc1857968b63
2014-05-26 07:49:03 +02:00
Jungshik Jang
1a4485dcd2
Add HdmiCecDeviceInfo to HdmiCecLocalDevice
...
As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.
Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
2014-05-26 13:52:14 +09:00
Jungshik Jang
02bb4265ac
Implement <Polling Message>.
...
When Device Discovery is launched or Hot-plug detection is
launched, the first step of it is to send <Polling Message>
to all remote devices. According to type of feature,
it may have different retry count for sending <Polling Message>.
As <Polling Message> to all devices should be serialized operation
it runs on io thread as single operation.
Along with this, added assertRunOnIoThread and
assertRunOnServiceThread used to make sure that all methods are
called in proper thread.
Change-Id: I2d2df0216867c188e99ba24b216ec73f3396eeae
2014-05-26 11:53:13 +09:00
Yuncheol Heo
1178cd29b2
Merge "Add the constants for the callback result of SendCecCommand()."
2014-05-26 02:45:40 +00:00
Yuncheol Heo
ece603b795
Add the constants for the callback result of SendCecCommand().
...
- Move the send failure warning messages into HdmiCecController.sendCommand()
from each Actions.
- Stringfy with more detail messages for some opcodes.
Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-05-26 11:35:09 +09:00
Jorim Jaggi
cc12a9daf6
Visual refinements for lockscreen.
...
Bug: 15244051
Bug: 14999913
Change-Id: I48896cfa3d88a25ae9c244968ae8e457b6d4e82d
2014-05-26 02:06:20 +02:00
Adrian Roos
bd57735c6c
am 47dda7ee: (-s ours) DO NOT MERGE Only send notification activity intents after dismissing Keyguard
...
* commit '47dda7eeeaeaa4ef6e49af88c43559e5036c8d99':
DO NOT MERGE Only send notification activity intents after dismissing Keyguard
2014-05-25 22:07:53 +00:00
Adrian Roos
7d7090d666
DO NOT MERGE Only send notification activity intents after dismissing Keyguard
...
Defers delivery of contentIntent and activity actions until
the lockscreen has been dismissed, so that activities don't
launch beneath it.
Bug: 14491010
Change-Id: Ic8c61c18a75d4f0da2d82a0a8a038a5d98ebb71f
(cherry picked from commit 79f640dd0d02c1cc199937b160d8f7abd3c1eaeb)
2014-05-25 21:50:15 +00:00
Jinsuk Kim
2918e9e133
CEC Initialization per device type
...
CEC initialization may vary from device type to type. Changed logical address
map to HdmiCecLocalDevice map to handle it. These per-type classes for local
device will be extended also to take care of incoming CEC commands that should
require different action based on device type.
Change-Id: Ia59a464607b14e942fcf83e63aa1d6310ca6a575
2014-05-25 21:32:50 +00:00
Craig Mautner
dd64b567c3
am 5db9ed92: (-s ours) Merge "Modify task navigation to return to recent tasks. DO NOT MERGE" into lmp-preview-dev
...
* commit '5db9ed92e0ed2429a42b1131f84bef378c5139d4':
Modify task navigation to return to recent tasks. DO NOT MERGE
2014-05-25 19:42:17 +00:00
Craig Mautner
cb60d78cbb
am a118cc26: (-s ours) Merge "Add code for persisting tasks and activities to disk DO NOT MERGE" into lmp-preview-dev
...
* commit 'a118cc265427a5db499ec8386b83fd8e84e6ccf5':
Add code for persisting tasks and activities to disk DO NOT MERGE
2014-05-25 19:42:12 +00:00
Craig Mautner
49a6e1b321
Merge "Modify task navigation to return to recent tasks. DO NOT MERGE" into lmp-preview-dev
2014-05-25 19:40:03 +00:00
Craig Mautner
0833d2bc87
Merge "Add code for persisting tasks and activities to disk DO NOT MERGE" into lmp-preview-dev
2014-05-25 19:39:47 +00:00
Philip Milne
3dc38c1b59
Merge "More on weights in GridLayout"
2014-05-25 04:13:25 +00:00
Philip Milne
dea890fa64
More on weights in GridLayout
...
Chance as little as possible from existing. If weights are defined only a
subset of the views in a layout (the normal case) leave the layout of the
remaining views unaffected.
Change-Id: I27473e303c0666930e2fb515b794df96a8b97272
2014-05-24 21:02:45 -07:00
John Spurlock
b5eb09f677
am 6eb1e4ca: Merge "QuickSettings: Remove default edge effect on scroller." into lmp-preview-dev
...
* commit '6eb1e4ca17c7722670c1c374de2a4203b58f6f87':
QuickSettings: Remove default edge effect on scroller.
2014-05-24 23:00:19 +00:00
John Spurlock
33a7306cbd
Merge "QuickSettings: Remove default edge effect on scroller." into lmp-preview-dev
2014-05-24 22:56:50 +00:00
John Spurlock
17aba4e2ec
QuickSettings: Remove default edge effect on scroller.
...
Bug:15186962
Change-Id: Ibc6aa8169fedf7b9e145955d652f3af8703cbe54
2014-05-24 18:53:16 -04:00
Guang Zhu
82d96d5e21
Merge "Revert "Add physical TV input handling to TvInputManagerService""
2014-05-24 19:03:02 +00:00
Guang Zhu
70aa0c6db3
Revert "Add physical TV input handling to TvInputManagerService"
...
Bug: 15197740
This reverts commit c8324a8e70d9f617c92f49e7c0b3e2484d9190fd.
Change-Id: Ie7b5405e929b5903f43188c3445fe9d24ecf92c2
2014-05-24 19:02:50 +00:00
Craig Mautner
e67a784eb2
Modify task navigation to return to recent tasks. DO NOT MERGE
...
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.
Fixes bug 14464114.
Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
2014-05-24 09:50:37 -07:00
Craig Mautner
4d22b4a016
Merge "Modify task navigation to return to recent tasks."
2014-05-24 16:48:16 +00:00
Jorim Jaggi
dcefe53e56
am f6e6bf6a: Merge "Fix intercept logic in NotificationPanelView." into lmp-preview-dev
...
* commit 'f6e6bf6aa23d8f0825c18bea74a757a5429fe3a8':
Fix intercept logic in NotificationPanelView.
2014-05-24 16:07:10 +00:00
Jorim Jaggi
5bfee4986a
Merge "Fix intercept logic in NotificationPanelView." into lmp-preview-dev
2014-05-24 16:04:18 +00:00
Wonsik Kim
5d038b9d6f
Merge "Add physical TV input handling to TvInputManagerService"
2014-05-24 15:13:47 +00:00
Selim Cinek
a0a580b606
am 0e8614b1: Merge "Notifications where clipped incorrectly in the unlocked shade." into lmp-preview-dev
...
* commit '0e8614b1ecd6c6cfe506323c6f6d6bae65804aea':
Notifications where clipped incorrectly in the unlocked shade.
2014-05-24 14:56:27 +00:00
Selim Cinek
a08334e506
Merge "Notifications where clipped incorrectly in the unlocked shade." into lmp-preview-dev
2014-05-24 14:53:36 +00:00
Jorim Jaggi
ce50b8199c
Fix intercept logic in NotificationPanelView.
...
We need to make sure that we only block the disallow intercept
request when interacting with the ScrollView. In the past, we also
blocked the disallow intercept request for the brightness slider, for
example.
Bug: 15169261
Change-Id: I02dd1e399a527509d631fdde54249d57748b20f2
2014-05-24 16:48:49 +02:00
Selim Cinek
f653dba7cb
Notifications where clipped incorrectly in the unlocked shade.
...
Previously the notification clipping did not account for the corners
of their rounded rects.
Bug: 15188616
Change-Id: If8ee1ceda0a5a43b4ab9e754804279834f93baa4
2014-05-24 16:47:06 +02:00
Philip Milne
4885f2f773
More on adding support for weights to GridLayout
...
Remove fields that are not needed with view-based allocation.
Change-Id: I23dc75fea47c532ad46e23b7fb14ff8e46c68db1
2014-05-24 06:14:27 +00:00
Philip Milne
9505480ee3
More on weighted space distribution in GridLayout
...
This CL changes the weight distribution algorithm to act on views rather
than rows/columns. This is a more general mechanism that is simpler to
define.
Change-Id: Ifa5adbe0b0a9a9ae271616321385f8e926aba054
2014-05-23 19:50:40 -07:00
Ruben Brunk
c371be303b
Merge "camera2: Remove CameraAccessException throw for vendor tag setup."
2014-05-24 02:03:51 +00:00