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
Wale Ogunwale
ed24700385
Merge "Fix issue #18240452 : No recents screenshot when resuming from keyguard." into lmp-mr1-dev
...
automerge: c56a1f1
* commit 'c56a1f17153844c8015a440ed52e84bbce0b894f':
Fix issue #18240452 : No recents screenshot when resuming from keyguard.
2014-11-05 01:25:09 +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
a04a5e82f0
am 6e85abd4: Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev
...
* commit '6e85abd45b890bf583346a0935d1f24a789dc88b':
Default gradient radius to %p when no intrinsic width or height set
2014-11-05 00:48:09 +00: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
ffcc5657b9
am 9fe0017d: am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
...
* commit '9fe0017dd1a2908d00b35a39edd00af5f9b79e14':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
2014-11-05 00:34:05 +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
Wale Ogunwale
d3e2a0891b
Fix issue #18240452 : No recents screenshot when resuming from keyguard.
...
WindowManager.keyguardGoingAway() isn't called early enough when you exit
the keyguard by clicking on a notification. So, the WindowState for the
preivous activity behind the keyguard is never transitioned to visible
and the activity manager then fails to take the screenshot for recents.
We will now be taking a screenshot of the activity before we go to sleep
so we are not dependent on signals from the keyguard.
Change-Id: I2acb2ad7a627d4e446ba11c9a0842d21fa6922d3
2014-11-04 16:09:19 -08:00
Alan Viverette
e9596818e5
am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev
...
* commit 'aa33a487c8bfa0503a4c744a932a8344a96d52e1':
Always update date picker position after change in range
2014-11-05 00:05:33 +00:00
Alan Viverette
aa33a487c8
Merge "Always update date picker position after change in range" into lmp-mr1-dev
2014-11-05 00:00:52 +00:00
Craig Mautner
b834080181
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: I9949ef0a1639c831754316da34de97cb86403f5a
2014-11-04 15:38:05 -08:00
Eric Gilmore
bf78adb25e
Adding 5.0 emulator image and removing older image.
...
2nd patch set includes low/high res. images.
Bug: 18026943
Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
2014-11-04 15:01:24 -08:00
Stuart Scott
8b564c2af8
Use CharSequence for DisplayName
...
Change-Id: Ibb93424b85b11913282a4980e756b66a8d7946d5
2014-11-04 14:47:47 -08:00
Adam Lesinski
af53bfd06e
am efd8a85d: Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev
...
* commit 'efd8a85d30c35ca4a274835f10e371289bb9bc5e':
Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
2014-11-04 22:37:03 +00:00
Adam Lesinski
efd8a85d30
Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev
2014-11-04 22:32:31 +00:00
Sreeram Ramachandran
9b32f9a466
am 0610ff97: Merge "Don\'t use framework permission strings for netd permissions." into lmp-mr1-dev
...
* commit '0610ff97f11d37d514ea20fcbd73a96ede3518ce':
Don't use framework permission strings for netd permissions.
2014-11-04 22:03:47 +00:00
Sreeram Ramachandran
0610ff97f1
Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev
2014-11-04 21:59:23 +00:00
Adam Lesinski
32e580604d
Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService
...
- Forgot to increment loop variable :S
Bug:18239732
Change-Id: Ie37a83584d7849108dbfd3bd4cbb595520d488b1
2014-11-04 13:38:46 -08:00
Alan Viverette
3fff156e13
am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
...
* commit '18b055e106d5452ef390716d3ea8d1641a225361':
Pass surface insets from window attributes rather than params
2014-11-04 19:34:13 +00:00
Alan Viverette
18b055e106
Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
2014-11-04 19:30:34 +00:00
Alan Viverette
93cad8c4d4
Pass surface insets from window attributes rather than params
...
Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.
BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
2014-11-04 11:27:19 -08:00
Scott Kennedy
9f07eb3503
am 50567bb1: am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit '50567bb1f047fbed512551534bff6ce017690588':
Fix a small typo in a variable name
2014-11-04 19:21:28 +00:00
Ricardo Cervera
9433c87b8a
am aa743477: am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit 'aa743477137e615ab35b9f6c0d131542cb9c6c41':
docs: Fix the circularReveal example.
2014-11-04 19:21:23 +00:00
Scott Kennedy
50567bb1f0
am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit '4b28b1c3f579e285b9b030ea1612bf7cb0ef04e1':
Fix a small typo in a variable name
2014-11-04 19:16:55 +00:00
Ricardo Cervera
aa74347713
am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit 'c190e7ee015202b6bc2be08a3c874efaf42b779f':
docs: Fix the circularReveal example.
2014-11-04 19:16:48 +00:00
Wale Ogunwale
e54553c841
am d54b578e: Fix issue #17305377 : Don\'t kill process if it still has tasks.
...
* commit 'd54b578e47fb410c776bb3a4272c2c523153f657':
Fix issue #17305377 : Don't kill process if it still has tasks.
2014-11-04 19:06:11 +00:00
Wale Ogunwale
d54b578e47
Fix issue #17305377 : Don't kill process if it still has tasks.
...
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.
Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.
Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
2014-11-04 10:59:31 -08:00
Sreeram Ramachandran
0f8f120839
Don't use framework permission strings for netd permissions.
...
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
2014-11-04 10:15:03 -08:00
Scott Kennedy
4b28b1c3f5
am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit 'cf57296da6a22bff03eefda7b704787769ad4d37':
Fix a small typo in a variable name
2014-11-04 18:12:05 +00:00
Ricardo Cervera
c190e7ee01
am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit 'af002b352ade0d7f9eeff15221f487c3912ebb34':
docs: Fix the circularReveal example.
2014-11-04 18:07:11 +00:00
Scott Kennedy
cf57296da6
am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
...
* commit 'd78ce50372ec473b6a895d053f9ffc2956e933ef':
Fix a small typo in a variable name
2014-11-04 18:06:32 +00:00
Scott Kennedy
d78ce50372
Merge "Fix a small typo in a variable name" into lmp-docs
2014-11-04 18:01:28 +00:00
Ricardo Cervera
af002b352a
am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
...
* commit '61f91724a9375732cd95333921388a3e5a64ac33':
docs: Fix the circularReveal example.
2014-11-04 18:00:56 +00:00
Ricardo Cervera
61f91724a9
Merge "docs: Fix the circularReveal example." into lmp-docs
2014-11-04 17:56:22 +00:00
Eric Laurent
13e4928a49
am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev
...
* commit 'fe91d4e6a2ef4e51910965ea258f91c14f5ee0dc':
AudioService: fix wired headset insertion delay.
2014-11-04 17:06:18 +00:00
Eric Laurent
fe91d4e6a2
Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev
2014-11-04 17:02:25 +00:00
Jorim Jaggi
534495c7a9
am 6fd88022: Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev
...
* commit '6fd88022c286730b6f17917dff2d9dd2d74bbfee':
Fix jump in two-finger expand motion with no notifications
2014-11-04 16:58:23 +00:00
Jorim Jaggi
6fd88022c2
Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev
2014-11-04 16:54:12 +00:00
Adrian Roos
a5dd432c08
am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev
...
* commit 'e94a84d2a78edd9f1b92d69aca361bc3affc1cfe':
Refactor LockSettingsService into storage and logic
2014-11-04 16:45:49 +00:00
Adrian Roos
e94a84d2a7
Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev
2014-11-04 16:40:38 +00:00
Adrian Roos
261d5ab8f4
Refactor LockSettingsService into storage and logic
...
Creates a new LockSettingsStorage class to handle
stroring and retreiving data.
Bug: 18163444
Change-Id: Ia3bc4ad679c5e1217756ae6b3b80cfce3599baed
2014-11-04 17:38:20 +01:00
John Spurlock
df80f1c92b
am 8c4aad50: Merge "QS: Create the tile background once per tile." into lmp-mr1-dev
...
* commit '8c4aad505a0034b89abbdd7e11c18ffe11756c5f':
QS: Create the tile background once per tile.
2014-11-04 16:30:01 +00:00
John Spurlock
8c4aad505a
Merge "QS: Create the tile background once per tile." into lmp-mr1-dev
2014-11-04 16:26:14 +00:00
Griff Hazen
07e8b2fb74
am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev
...
* commit '9c95015b0ccaa02b97b4c96950e2b07e6a5a7b4e':
Improve support for the barcode-on-screen use case for wearables.
2014-11-04 15:28:14 +00:00
Rob Tsuk
c4aea977cd
am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev
...
* commit 'e6c0bda5dd945f3668b4108c49ee52f1a04253d6':
Make points drawn with default paint visible
2014-11-04 15:23:59 +00:00