Craig Mautner
3f36ba647d
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
2014-11-05 19:07:59 +00:00
Paul Jensen
021a95f761
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
2014-11-05 19:05:09 +00:00
Dan Sandler
ac8dbdafea
Merge "Materialize default app icon." into lmp-mr1-dev
2014-11-05 18:58:14 +00:00
Ricardo Cervera
caecc4ae3d
am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21
...
* commit 'df37d45f1311dcbfbcc58b3ff81f3df56c46fcdd':
docs: Add instructions to attach debugger to a running process.
2014-11-05 18:54:12 +00:00
Bryce Lee
ca7f9a4d4e
am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
...
* commit '5a818e55a7faee421567eb037ac4e42f20bca0c4':
Add config to control going to sleep when entering theater mode.
2014-11-05 18:54:06 +00:00
Daniel Sandler
70bbbd32be
Merge "More flexible intent extra parsing." into lmp-mr1-dev
2014-11-05 18:53:44 +00:00
Craig Mautner
276a6eb879
When keyguard exits use same anim for all windows
...
The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.
Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.
This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.
(Also refactorings to eliminate redundant code and unnecessary
variables.)
Fixes bug 15991916.
Change-Id: I844d102439b6eda8c912108431916e04b12f7298
2014-11-05 10:47:14 -08:00
RoboErik
9af44ddf03
Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev
2014-11-05 18:29:32 +00:00
RoboErik
5604a85ac6
Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
...
* changes:
Add extras to the PlaybackState
Add setRatingType to MediaSession
2014-11-05 18:26:00 +00:00
Jeff Davidson
ea651a4fbf
Merge "Update network selections on capability change." into lmp-mr1-dev
2014-11-05 17:41:36 +00:00
Filip Gruszczynski
34afdf0276
Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev
2014-11-05 17:39:34 +00:00
Ricardo Cervera
df37d45f13
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
...
automerge: 25a4e21
* commit '25a4e21e13217708e9ff99beb21f88151ea2cbd4':
docs: Add instructions to attach debugger to a running process.
2014-11-05 17:08:37 +00:00
Tyler Gunn
4255ec5c57
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
2014-11-05 17:03:13 +00:00
Dan Sandler
d29149d2ee
Materialize default app icon.
...
Bug: 17999428
Change-Id: Ib7430993fc44051c70a802442dce15ca4cd592d4
2014-11-05 12:02:22 -05:00
Ricardo Cervera
25a4e21e13
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
2014-11-05 16:58:23 +00:00
Bryce Lee
5a818e55a7
Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev
2014-11-05 16:41:40 +00:00
Jorim Jaggi
09ba32c0ba
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev
2014-11-05 16:17:33 +00:00
Andres Morales
36531b33b8
Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev
2014-11-05 16:01:24 +00:00
George Mount
8b26674aa1
Merge "Fix javadoc." into lmp-mr1-dev
2014-11-05 15:22:43 +00:00
John Spurlock
0bdefb9953
Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
2014-11-05 14:47:20 +00:00
John Spurlock
2face5e2e8
Merge "QS: Toggle tile icon animations." into lmp-mr1-dev
2014-11-05 14:47:03 +00:00
Paul Jensen
c53113b37f
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
...
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.
bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
2014-11-05 09:35:26 -05:00
John Spurlock
c6df3cf273
QS: Toggle tile icon animations.
...
- New location tile icon animation.
- New flashlight tile icon animation.
- New airplane-mode tile icon animation.
- New color inversion tile icon animation.
- Remove obsolete static icons.
Bug: 17426910
Change-Id: I51c98979afd46f4cdfc2fd383e80d7bf13c5eeab
2014-11-05 09:20:16 -05:00
Jorim Jaggi
3e9d9b5953
Fix janky in transition doze -> lockscreen
...
Also fix some unnecessary layer creation for dismiss button.
Bug: 18238168
Change-Id: I71989f2a24162e4453781c07e50d6c25fb380089
2014-11-05 15:08:15 +01:00
John Spurlock
37bc92cc23
Zen: Create a new exit condition for "next alarm".
...
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.
Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
2014-11-05 08:46:01 -05:00
Jungshik Jang
090354861a
Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev
2014-11-05 05:54:15 +00:00
Alan Viverette
9342b049b9
Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
2014-11-05 04:44:22 +00:00
Tom Taylor
8da5180d3d
am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection i
...
* commit '865a6582462a132c3d579b0cae0792062d76833e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:36:34 +00:00
Tom Taylor
77037113a8
am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'dd41b6292433915b5b470c61476afca11df043e3':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:36:20 +00:00
Alan Viverette
44eb8b7729
Revert "When keyguard exits use same anim for all windows"
...
Broke window animations.
This reverts commit b834080181 .
BUG: 18248641
Change-Id: Ic456a5666c3199e8bb8c9c2fb1ecdbb82afaad86
2014-11-04 20:34:41 -08:00
Jungshik Jang
326aef0c94
Add recorder address to all recording listerner apis.
...
It enables to recognize which recorder reports record status.
Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a
2014-11-05 13:32:52 +09:00
Tom Taylor
865a658246
am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana
...
* commit '4e9851183daf26d602d641917378d55a9516f128':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:26:13 +00:00
Tom Taylor
dd41b62924
am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'f2f59e7ab916e37d510db151904c95c42006ae08':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:26:09 +00:00
Tom Taylor
4e9851183d
am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '6209d4e4d8a8662628c53cd5e1944abf30293d87':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:21:07 +00:00
Tom Taylor
f2f59e7ab9
am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:20:11 +00:00
Filip Gruszczynski
a15aa7d426
Automatic brightness using ALS while dozing.
...
Bug: 16525667
Change-Id: Ib75cfebf46f2c122e7b68556591b601d22a318e1
2014-11-05 02:09:47 +00:00
Alan Viverette
a446195b0d
Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
2014-11-05 02:09:30 +00:00
Andres Morales
671988302e
Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev
2014-11-05 01:48:22 +00:00
Alan Viverette
9c95264e84
Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391
Use default token instead of wrapped window manager
...
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
2014-11-04 17:40:29 -08:00
Andres Morales
97621e05c0
Increase min free levels for cached processes on 64bit
...
Requires less memory pressure to start killing cached
processes.
Bug: 18241791
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
2014-11-05 01:36:27 +00:00
Craig Mautner
26a733ce33
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
2014-11-05 01:23:04 +00:00
Stuart Scott
8585e0dd4c
Merge "Use CharSequence for DisplayName" into lmp-mr1-dev
2014-11-05 01:19:12 +00:00
Wale Ogunwale
c56a1f1715
Merge "Fix issue #18240452 : No recents screenshot when resuming from keyguard." into lmp-mr1-dev
2014-11-05 01:14:22 +00:00
Alan Viverette
2cd23e6b9d
Fix hasSurfaceInsets check when creating hardware renderer
...
BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
2014-11-04 17:04:02 -08:00
Jeff Davidson
9634abe86b
Update network selections on capability change.
...
Among other reasons, this is needed when a Wi-Fi connection is
upgraded from untrusted to trusted, so that the default route can be
updated to point to the Wi-Fi network instead.
Bug: 18206275
Change-Id: I53f7a6f00f66a23ae4873fa2334cd8a621f39d4f
2014-11-04 16:48:27 -08:00
Alan Viverette
6e85abd45b
Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev
2014-11-05 00:43:16 +00:00
Eric Gilmore
9fe0017dd1
am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit '1c9860f9285709cddff2e570a50e3afc66091135':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:26:49 +00:00
Eric Gilmore
1c9860f928
am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit '4f82acd810601c4d055906cb2b671cafd15d3fc8':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:20:18 +00:00
Eric Gilmore
4f82acd810
am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit 'bf78adb25e80b9107fcd682d30e7157093681547':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:12:16 +00:00