Evan Charlton
235c159633
Merge "Add a way to fetch the current connection manager" into lmp-dev
2014-09-05 15:41:24 +00:00
Christoph Studer
fbac214103
NoMan: Fix speedbump with multiple package priorities
...
Bug: 16782616
Change-Id: I747dc981f7974720da9f277ec6e3fba31c21f226
2014-09-05 17:40:43 +02:00
Alexandra Gherghina
6cd1cb7e66
am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev
...
* commit 'e27eb3ec797a5a9621fc4eece3579bb4fcbf0363':
Rename intent extra following API review
2014-09-05 15:31:17 +00:00
Marcin Kosiba
312355a9ca
am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
...
* commit '210d7b224da0425b3c65888ac49abd1c6ef9f846':
Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
2014-09-05 15:31:13 +00:00
Chris Wren
4b7df3de90
am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev
...
* commit 'b59b5205ff9c784085bf6b85bceb496e608fc042':
Keep contact affinities separate across users.
2014-09-05 15:31:05 +00:00
Shishir Agrawal
86dd27974b
am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev
...
* commit 'e90b1315a83fd75906fa1bc876fb2973cf6f8676':
IccOpenLogicalChannelResponse: Adding final to fa few constants.
2014-09-05 15:31:01 +00:00
Esteban Talavera
6365b3f2de
am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
...
* commit '2c6aa357bddb428193c0c006d9535f208b9d8903':
Changed value of EXTRAs to match constant name in code.
2014-09-05 15:30:56 +00:00
Anwar Ghuloum
09f0ee5414
am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev
...
* commit 'f8545bc6f498e0b93f7ee42e51ea0ff05e695731':
Timing Hacks DO NOT MERGE
2014-09-05 15:30:51 +00:00
George Mount
88582621bd
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:47 +00:00
George Mount
927ee8d84d
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:42 +00:00
Christoph Studer
c0d1d98e9b
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
c39ba3ee0a
am 6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev
...
* commit '6f52cfa8f52559fcc3c5c17348da18d18eed5655':
Remove the scrimming of notifications
2014-09-05 15:30:33 +00:00
Adrian Roos
cbf32fd75b
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:28 +00:00
George Mount
4decae92f7
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:22 +00:00
Jorim Jaggi
aaabb0bc19
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:17 +00:00
Selim Cinek
a433f61f9a
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:13 +00:00
Martin Kosiba
057e4da03f
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:08 +00:00
Winson Chung
b209a05cdb
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:03 +00:00
Jason Monk
fd382a8981
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:29:58 +00:00
Adrian Roos
594da9adc5
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:53 +00:00
Jorim Jaggi
613f723d30
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:47 +00:00
Kenny Guy
6fe0224216
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:43 +00:00
Christoph Studer
3cc1d40f40
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:38 +00:00
Winson Chung
4de91d8325
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:34 +00:00
Brian Carlstrom
ed33b60918
am 8a5a6aec: Merge "Fix backwards arguments to performDexOpt" into lmp-dev
...
* commit '8a5a6aec125a398d7c14874a3780b27d642ee892':
Fix backwards arguments to performDexOpt
2014-09-05 15:29:30 +00:00
Jungshik Jang
1a268ec146
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:26 +00:00
Tom O'Neill
d528930380
Suppress location tile in QS on lock screen
...
- Work around bug in QS implementation
- Bug: 15916487
Change-Id: I623a4e31e8b4187d920c2724182c927328885b3b
2014-09-05 08:22:47 -07:00
Alexandra Gherghina
f363bda252
Merge "Rename intent extra following API review" into lmp-dev
2014-09-05 15:16:02 +00:00
Marcin Kosiba
8d4e83aca0
Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev
2014-09-05 15:13:40 +00:00
Chris Wren
c237555c6c
Merge "Keep contact affinities separate across users." into lmp-dev
2014-09-05 14:58:40 +00:00
Shishir Agrawal
949bb79f70
Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev
2014-09-05 14:48:20 +00:00
Alexandra Gherghina
3315f6b5a3
Rename intent extra following API review
...
Bug: 17389968
Change-Id: Id2bd8d12019ad7a4c5a3ac8a7f76f55d06fc4dff
2014-09-05 15:48:07 +01:00
Esteban Talavera
ac15b85229
Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev
2014-09-05 14:46:10 +00:00
Chris Wren
da4bd209cf
Keep contact affinities separate across users.
...
Also ignore people extras on USER_ALL notifications.
Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
2014-09-05 10:36:32 -04:00
Jason Monk
3128f12f21
Add VPN Key to signal icons
...
Since the notification is going away, this gives a persistent
icon to indicate that VPN is active.
Bug: 16153201
Change-Id: Ic2ca7a332817967b76871bd0800d6f0a77a295cd
2014-09-05 10:31:00 -04:00
Anwar Ghuloum
248b369661
Merge "Timing Hacks DO NOT MERGE" into lmp-dev
2014-09-05 14:22:51 +00:00
Marcin Kosiba
100c20c900
Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
...
This is in response to API council feedback.
BUG: 17253647
Change-Id: I6da2aa2510a73276fcdbad9219adfeaaed41d3ba
2014-09-05 14:22:32 +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
12a6782d61
Don't update notification layer when collapsing the panel
...
This change makes sure that we don't update the hardware for the
notification layer when we collapse or expand the panel. It does so
by starting the fading when the panel is more collapsed.
Bug: 17287256
Change-Id: I35dc35494d71d816b7e6c5821b769847aaa183b0
2014-09-05 16:01:00 +02:00
Christoph Studer
668c8970ff
SysUI: Sort status bar notification icons
...
Bug: 15761406
Change-Id: I64884319014d6fa3008c0db4060db7b9b066b6d7
2014-09-05 16:00:09 +02: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