Anwar Ghuloum
d8541e438b
am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev
...
* commit 'f8545bc6f498e0b93f7ee42e51ea0ff05e695731':
Timing Hacks DO NOT MERGE
2014-09-05 15:30:49 +00:00
George Mount
d85dd0fd1f
am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev
...
* commit 'b555f0cf77c66c9d8204146c3f16e27cf83c4ed8':
Fix selection of epicenter in Activity Transitions.
2014-09-05 15:30:45 +00:00
George Mount
2654657fca
am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev
...
* commit 'da6df616bc21eabf56ff9de8f8606898fc388e60':
Fix NPE when Window disappears during a transition.
2014-09-05 15:30:41 +00:00
Christoph Studer
cca269f2fd
am fa169184: Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev
...
* commit 'fa1691841ea52fd34b1f6c80918763e5816c25b9':
NoMan: Fix speedbump for PRIORITY_MIN intrusives
2014-09-05 15:30:37 +00:00
Jorim Jaggi
5709ae20f0
am 6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev
...
* commit '6f52cfa8f52559fcc3c5c17348da18d18eed5655':
Remove the scrimming of notifications
2014-09-05 15:30:34 +00:00
Adrian Roos
14f779c42f
am 8ab59227: Merge "Reorder brightness slider mirror in front of album art" into lmp-dev
...
* commit '8ab5922758bf29d1b7de82214e9b7e6c3eb7c0ee':
Reorder brightness slider mirror in front of album art
2014-09-05 15:30:31 +00:00
George Mount
371d00e4b0
am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev
...
* commit '472294569a26cb60d75202d5bc13e44fb040dbce':
API Review: Change SharedElementListener to SharedElementCallback.
2014-09-05 15:30:27 +00:00
Jorim Jaggi
70d56cf4dc
am 4ec48cb7: Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev
...
* commit '4ec48cb7b428eef28e95ec4c6bf484d32196fa1a':
Hide notifications when occluded and disabled on keyguard
2014-09-05 15:30:23 +00:00
Selim Cinek
efc953276d
am 1f49d9b3: Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev
...
* commit '1f49d9b36609f9260bdf85ff3f5dc85f8af7229b':
Fixed a bug where the notifications could overlap when reset
2014-09-05 15:30:20 +00:00
Martin Kosiba
3046b13006
am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev
...
* commit 'c3ec88fd433540729a4a818d4d01b21cf2106835':
Change WebView.zoomBy return type to void.
2014-09-05 15:30:16 +00:00
Winson Chung
aeab63fb1d
am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev
...
* commit '927df1c290c65ae877b67e2383517494ee7afb68':
Generalizing Recents widget category to Search box. (Bug 17334589)
2014-09-05 15:30:12 +00:00
Jason Monk
1c682c9024
am 78337827: Merge "Allow downtime to exit from no interruptions" into lmp-dev
...
* commit '783378274989c6d5fe032993f595e85cc58c362e':
Allow downtime to exit from no interruptions
2014-09-05 15:30:00 +00:00
Adrian Roos
620f0374c5
am c5126d91: Merge changes Ibb63814e,I0322b1e6 into lmp-dev
...
* commit 'c5126d91e9d772f3f1ed64404746f8fe7af580a7':
Prevent full shade guesture from doing the wrong thing
Add current user announce to MultiUserSwitch
2014-09-05 15:29:57 +00:00
Jorim Jaggi
48fad4996e
am 162a1b42: Merge "Use material screen off animation for all devices" into lmp-dev
...
* commit '162a1b4273ec8461c58925b5450392ad4920c548':
Use material screen off animation for all devices
2014-09-05 15:29:53 +00:00
Kenny Guy
c57a8701b6
am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev
...
* commit '42484d4365201d4250ebedb2f4cd6348c626b158':
Fix RemoteViews to inflate views for current user.
2014-09-05 15:29:50 +00:00
Christoph Studer
1452ced2cd
am 8dd353c8: Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev
...
* commit '8dd353c86c38f181032b5e0135bb91707ced9832':
SysUI: Upsort PRIORITY_MAX system notifications
2014-09-05 15:29:46 +00:00
Winson Chung
5b55ae993c
am 893fd9fc: Merge "Ensure that there is enough space for the tablet search widget. (Bug 17190069)" into lmp-dev
...
* commit '893fd9fc8320806a5bf14284775e2600c85f78d2':
Ensure that there is enough space for the tablet search widget. (Bug 17190069)
2014-09-05 15:29:42 +00:00
Brian Carlstrom
cc9af8c62c
am 8a5a6aec: Merge "Fix backwards arguments to performDexOpt" into lmp-dev
...
* commit '8a5a6aec125a398d7c14874a3780b27d642ee892':
Fix backwards arguments to performDexOpt
2014-09-05 15:29:39 +00:00
Jungshik Jang
3c50927bb4
am 796603a5: Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev
...
* commit '796603a56b6dac4eb7c7111fec38f8b564fdb45d':
Prevent sending <Feature Abort> for some messages.
2014-09-05 15:29:35 +00:00
Anwar Ghuloum
248b369661
Merge "Timing Hacks DO NOT MERGE" into lmp-dev
2014-09-05 14:22:51 +00:00
Anwar Ghuloum
629dc18013
Timing Hacks DO NOT MERGE
...
Let's submit to see any lingering effects.
Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
2014-09-05 07:17:39 -07:00
George Mount
ffd09aed4e
Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev
2014-09-05 14:14:53 +00:00
George Mount
c2d66a0282
Merge "Fix NPE when Window disappears during a transition." into lmp-dev
2014-09-05 14:14:40 +00:00
Christoph Studer
7f579fda4b
Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev
2014-09-05 14:11:52 +00:00
Christoph Studer
327bf78a7d
NoMan: Fix speedbump for PRIORITY_MIN intrusives
...
Bug: 16782616
Change-Id: I35fb875bed8cbd90ecd37edc8973c1771be3584d
2014-09-05 14:11:37 +00:00
Jorim Jaggi
f2f0a071c2
Merge "Remove the scrimming of notifications" into lmp-dev
2014-09-05 13:58:33 +00:00
Adrian Roos
c2c661fccc
Merge "Reorder brightness slider mirror in front of album art" into lmp-dev
2014-09-05 13:58:33 +00:00
George Mount
88dcd1a5f7
Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev
2014-09-05 13:55:35 +00:00
Jorim Jaggi
f9fb30f54b
Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev
2014-09-05 13:51:37 +00:00
Adrian Roos
cc74113ac6
Reorder brightness slider mirror in front of album art
...
Fixes slider disappearing when album art is showing.
Bug: 17373958
Change-Id: Ifdb184a6a750f798bc94a9d1eeca9299b246a513
2014-09-05 15:50:53 +02:00
Selim Cinek
4c866929d7
Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev
2014-09-05 13:49:23 +00:00
Martin Kosiba
76c9742862
Merge "Change WebView.zoomBy return type to void." into lmp-dev
2014-09-05 13:44:34 +00:00
Martin Kosiba
3a82acdbf6
Change WebView.zoomBy return type to void.
...
It turns out that the semantics of the return value are confusing
and so we decided to not return a result from this method at all.
The developer can call canZoomIn/canZoomOut to determine whether
the WebView is at the zoom limit, so there is no loss of
functionality.
BUG: 17374808
Change-Id: I4dfde71d5ac4a3f91c8755b257411aad06a1b1f6
2014-09-05 13:41:48 +00:00
Winson Chung
acdc602f18
Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev
2014-09-05 13:41:40 +00:00
Jason Monk
b836ddef15
Merge "Allow downtime to exit from no interruptions" into lmp-dev
2014-09-05 13:39:23 +00:00
Jorim Jaggi
06c19ea001
Remove the scrimming of notifications
...
Not really needed anymore and adds a lot of overdraw. Let's get rid
of it.
Bug: 17287256
Bug: 17346296
Change-Id: I319596f7059b6ed0d3d7a578d3c786921001f4b5
2014-09-05 15:37:12 +02:00
Jorim Jaggi
da30a03d96
Hide notifications when occluded and disabled on keyguard
...
Bug: 17371021
Change-Id: I27769a2334285fe753a3ee5ce55986d4fd23b83c
2014-09-05 15:13:39 +02:00
Adrian Roos
fdd04d42d2
Merge changes Ibb63814e,I0322b1e6 into lmp-dev
...
* changes:
Prevent full shade guesture from doing the wrong thing
Add current user announce to MultiUserSwitch
2014-09-05 12:57:55 +00:00
Selim Cinek
6e28a678c7
Fixed a bug where the notifications could overlap when reset
...
This is because we did not receive a layout request even though
the notification was updated.
Bug: 17357688
Change-Id: Ie6295d07f4c00ec014b17671ad646261c4bb7e0f
2014-09-05 14:43:28 +02:00
Jorim Jaggi
d26a20fcd0
Merge "Use material screen off animation for all devices" into lmp-dev
2014-09-05 12:16:00 +00:00
Kenny Guy
da3af8fe1b
Merge "Fix RemoteViews to inflate views for current user." into lmp-dev
2014-09-05 11:19:01 +00:00
Christoph Studer
038839e947
Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev
2014-09-05 09:33:43 +00:00
Winson Chung
9a245b5de3
Merge "Ensure that there is enough space for the tablet search widget. (Bug 17190069)" into lmp-dev
2014-09-05 09:25:18 +00:00
Winson Chung
517c9ef165
Ensure that there is enough space for the tablet search widget. (Bug 17190069)
...
Change-Id: I89694edac6f299e4a9cfca8a99a0d71dce1ae168
2014-09-05 09:23:20 +00:00
Brian Carlstrom
839849111c
Merge "Fix backwards arguments to performDexOpt" into lmp-dev
2014-09-05 07:25:37 +00:00
Brian Carlstrom
d382be9b22
Fix backwards arguments to performDexOpt
...
Bug: 16696554
Change-Id: I302f8edc8243d3537afd564599cc798708124dbe
2014-09-05 00:07:25 -07:00
Jungshik Jang
71cc3b8e84
Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev
2014-09-05 05:25:37 +00:00
Wink Saville
eb805eb767
am a829f8e2: Merge "More cleanup prior to unhiding" into lmp-dev
...
* commit 'a829f8e2462157c16f60a52edd39b3c49209ab76':
More cleanup prior to unhiding
2014-09-05 03:50:42 +00:00
Wink Saville
3e0c8d3d3c
Merge "More cleanup prior to unhiding" into lmp-dev
2014-09-05 03:40:19 +00:00
Adam Powell
9dd998a18e
am c3b7ca91: Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev
...
* commit 'c3b7ca9161efcc9a7646989b6b10f505cf5056e1':
Menu callbacks for ToolbarActionBars, part 2
2014-09-05 02:56:13 +00:00