Andrew Solovay
56576838a8
am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
...
* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
docs: Removed broken link to non-existent method.
2014-11-05 18:47:17 +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
Ricardo Cervera
b4125d1e0b
am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
...
* commit '58f1200c333deea72ed6e095587f0bcb1fb65ce3':
docs: Add instructions to attach debugger to a running process.
2014-11-05 18:47:13 +00:00
Rich Slogar
1afa82dce0
docs:remove sdk/ndk note
...
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
2014-11-05 10:46:50 -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
Andrew Solovay
d9ceae8f97
Merge "docs: Removed broken link to non-existent method." into lmp-docs
2014-11-05 18:14:05 +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
Tyler Gunn
0bfb97cddf
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
...
automerge: 4255ec5
* commit '4255ec5c57ace18b0a78ebcbf0d573213123e586':
Support disconnecting conference participants from conference.
2014-11-05 17:38:45 +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
58f1200c33
Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
2014-11-05 17:00:10 +00: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
80a28fe8d6
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev
...
automerge: 09ba32c
* commit '09ba32c0ba9306bafa25e27a2fa7d6e53e9be715':
Fix janky in transition doze -> lockscreen
2014-11-05 16:37:13 +00:00
Andres Morales
3bc103b8db
Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev
...
automerge: 36531b3
* commit '36531b33b8e5bb249010f2414ed41d244c571464':
Only allow USER_OWNER to access PDB and change OEM unlock ability
2014-11-05 16:36:06 +00:00
George Mount
dd185b657d
Merge "Fix javadoc." into lmp-mr1-dev
...
automerge: 8b26674
* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
Fix javadoc.
2014-11-05 16:34:41 +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
513f260200
Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
...
automerge: 0bdefb9
* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
Zen: Create a new exit condition for "next alarm".
2014-11-05 15:20:12 +00:00
John Spurlock
055acca7c8
Merge "QS: Toggle tile icon animations." into lmp-mr1-dev
...
automerge: 2face5e
* commit '2face5e2e86cb7850c2ce67306f5aad04af6f597':
QS: Toggle tile icon animations.
2014-11-05 15:19:02 +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
9ae3fe48d9
am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev
...
* commit '090354861a92c1cf0c8c2baa438d1b770d67dd9f':
Add recorder address to all recording listerner apis.
2014-11-05 06:18:44 +00: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
6a98dde8df
am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
...
* commit '9342b049b9a605b1904e03f904ec3cbf90f7742d':
Use default token instead of wrapped window manager
2014-11-05 04:50:50 +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
53a5acd096
am 8da5180d: 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: SQ
...
* commit '8da5180d3debf8bf47e8d19e8d606e38580b0a84':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:41:34 +00:00
Tom Taylor
0e69335f1a
am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
...
* commit '77037113a8d654451a3890fecb2e6be4bd679634':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 04:41:28 +00:00
Alan Viverette
3ea1a3e781
am 44eb8b77: Revert "When keyguard exits use same anim for all windows"
...
* commit '44eb8b772984164666195ea71c685292b234549a':
Revert "When keyguard exits use same anim for all windows"
2014-11-05 04:41:23 +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 b83408018176ec58f50e792590a22fdc9eb87fff.
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
Alan Viverette
405165b6cd
am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
...
* commit 'a446195b0d22659ff402e3b6ac76b1b876e5fe3b':
Fix hasSurfaceInsets check when creating hardware renderer
2014-11-05 02:35:15 +00:00
Andres Morales
4f781559ec
am 67198830: Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev
...
* commit '671988302e344f18a0b6b2257c968a707c2189aa':
Increase min free levels for cached processes on 64bit
2014-11-05 02:35:09 +00:00
Alan Viverette
a77e349a36
am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
...
* commit '9c95264e847b02b688e12a3dd75b1e54502b3246':
Abort accessibility node prefetch if parent node is null
2014-11-05 02:35:04 +00:00
Craig Mautner
bf8e9884f1
am 26a733ce: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
...
* commit '26a733ce339380f98b4206654b38bf8fd000dda9':
When keyguard exits use same anim for all windows
2014-11-05 02:34:57 +00:00
Stuart Scott
fc1e84777c
am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev
...
* commit '8585e0dd4c7cf7b883de9cd40dc81099abe246c4':
Use CharSequence for DisplayName
2014-11-05 02:18:35 +00:00