Adam Cohen
9710ec9d85
am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
...
* commit '060a48378f21a6b5836990a23178d02c94fccc60':
Fix NPE in case where workspace is null because Launcher has been destroyed
2013-11-26 12:00:48 -08:00
Adam Cohen
060a48378f
Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
2013-11-26 19:57:10 +00:00
Adam Cohen
37c717ffa6
Fix NPE in case where workspace is null because Launcher has been destroyed
...
Bug: 11765964
Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
2013-11-26 19:52:58 +00:00
Dan Sandler
314aaeca0c
am a6a296ba: Revert "Enable Launcher2 workspace import."
...
* commit 'a6a296ba1ffba6c5b98e92f05254f0317f28290b':
Revert "Enable Launcher2 workspace import."
2013-11-26 10:58:50 -08:00
Dan Sandler
a6a296ba1f
Revert "Enable Launcher2 workspace import."
...
This reverts commit 5b3bdd394e .
Bug: 11768766
Bug: 9832552
2013-11-26 18:55:28 +00:00
Michael Jurka
e5db9b9db1
am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
...
* commit '04a231bbe44e9af184e76f124430a5bf7ae8ac8a':
Making workspace->overview transition smoother
2013-11-26 05:59:35 -08:00
Adam Cohen
616af06ac5
am cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
...
* commit 'cccfe95beb2de07fb3aef19e99e975e3a01cd055':
Allowing ability to pick up items / enter overview before full page settle
2013-11-26 05:59:13 -08:00
Michael Jurka
04a231bbe4
Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
2013-11-26 13:35:40 +00:00
Adam Cohen
cccfe95beb
Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
2013-11-25 18:46:23 +00:00
Michael Jurka
853f5a46eb
Making workspace->overview transition smoother
...
- Also set interpolator on page indicators
2013-11-25 16:02:09 +01:00
Dan Sandler
658e56fcca
am 5b3bdd39: Enable Launcher2 workspace import.
...
* commit '5b3bdd394e4401d7e91d528ef1d424d1af271d97':
Enable Launcher2 workspace import.
2013-11-25 05:31:07 -08:00
Dan Sandler
5b3bdd394e
Enable Launcher2 workspace import.
...
Bug: 11800663
Change-Id: I5c8963bde69e667bf726d1f926a913c347294e16
2013-11-21 08:29:51 -05:00
Mathew Inwood
3705bb1b79
Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermit
2013-11-21 09:55:03 +00:00
Mathew Inwood
72fbec17e0
Add support for initiating a drag from an overlay.
...
This allows an overlay to create apps and shortcuts on the home screen.
Change-Id: I63ee4ef02db3f4bc89726c394fd55ad26f50452c
2013-11-20 11:45:53 +00:00
Winson Chung
954966bc27
am 2c130e1f: Reducing workspace grid for dogfooding.
...
* commit '2c130e1f293c67275d78c862e3240a47fea0e2e7':
Reducing workspace grid for dogfooding.
2013-11-19 15:15:20 -08:00
Winson Chung
2c130e1f29
Reducing workspace grid for dogfooding.
2013-11-19 15:10:12 -08:00
Winson Chung
2e06b6dac2
am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf
...
* commit '6dc8f7c856f51223213c4106ebe9320f15f01013':
Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
2013-11-19 12:05:16 -08:00
Winson Chung
6dc8f7c856
Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf
2013-11-19 20:02:19 +00:00
Dan Sandler
91d30b7677
am f0b8dacf: Disable importing workspaces from Launcher2.
...
* commit 'f0b8dacf1516e0d901c71109c906dc15ef855fc5':
Disable importing workspaces from Launcher2.
2013-11-19 11:34:38 -08:00
Dan Sandler
f0b8dacf15
Disable importing workspaces from Launcher2.
...
Bug: 9832552
Bug: 11761032
Change-Id: I4dfd16046e9d6d0d1d864dff4340b0ed13cc8b8f
2013-11-19 19:31:04 +00:00
Winson Chung
f0716b7a74
Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
2013-11-18 16:09:54 -08:00
Winson Chung
97436804cd
am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
...
* commit '540efef758eb3bcf3bafe2241a4e3652a0e22c56':
Initialize FastBitmapDrawable bounds with default bitmap dimensions.
Updating LauncherModel filtering to use screen ids. (Bug 11685286)
2013-11-18 14:14:18 -08:00
Winson Chung
540efef758
Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
...
* changes:
Initialize FastBitmapDrawable bounds with default bitmap dimensions.
Updating LauncherModel filtering to use screen ids. (Bug 11685286)
2013-11-18 22:12:11 +00:00
Winson Chung
268f1c563f
Initialize FastBitmapDrawable bounds with default bitmap dimensions.
...
Change-Id: Ida9603e35b242a581b9401c6440875cd511725a1
2013-11-18 14:04:41 -08:00
Adam Cohen
a765215280
Allowing ability to pick up items / enter overview before full page settle
...
-> Fixes issue 11701996
-> Fixes issue where if you tried to longpress a widget before the page
settled, it would instead enter overview
Change-Id: Ic6321805687dd5e8c69506c6cd6941a11d557ed6
2013-11-18 20:08:11 +00:00
Adam Cohen
2aeb177876
am f9618856: Syncing up state transition with paging transition
...
* commit 'f9618856d6910ac385ad37762f9f067ae59a8622':
Syncing up state transition with paging transition
2013-11-18 10:35:29 -08:00
Adam Cohen
f9618856d6
Syncing up state transition with paging transition
...
Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e
2013-11-18 15:21:29 +00:00
Winson Chung
9b9fb967b2
Updating LauncherModel filtering to use screen ids. (Bug 11685286)
...
- Fixes the issue with the current page not synchronously binding
Change-Id: I3dfa45cc1777f846c77f3e86059dfb715553e1a3
2013-11-15 15:46:27 -08:00
Winson Chung
2c73d9238d
am 603d19a3: Merge "Additional logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
...
* commit '603d19a333d53f537591107751b327cfc7b856fc':
Additional logs to track down missing workspace screen. (Bug 11683562)
2013-11-15 13:30:15 -08:00
Winson Chung
603d19a333
Merge "Additional logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
2013-11-15 21:27:34 +00:00
Winson Chung
9f9f00bca6
Additional logs to track down missing workspace screen. (Bug 11683562)
...
Change-Id: I4f6b3c3ae07e2069bad01940dfce6bdc9cdb0ae0
2013-11-15 13:27:00 -08:00
Winson Chung
0788360cd6
am 28b690ab: Merge "Adding logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
...
* commit '28b690ab8e21d28ae5ebdea32475d3f1952203a5':
Adding logs to track down missing workspace screen. (Bug 11683562)
2013-11-15 13:13:58 -08:00
Winson Chung
28b690ab8e
Merge "Adding logs to track down missing workspace screen. (Bug 11683562)" into jb-ub-now-jolly-elf
2013-11-15 21:11:22 +00:00
Winson Chung
a90303bb6f
Adding logs to track down missing workspace screen. (Bug 11683562)
...
Change-Id: I12ef3331ab81004c75229d33afa0a8dd0fa8521c
2013-11-15 13:10:03 -08:00
Adam Cohen
fe6376c275
am 582a3694: Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
...
* commit '582a36949b4e86feedaaceea0ae0f96dc746640c':
Adding method to get the search bar bounds.
2013-11-15 10:22:05 -08:00
Adam Cohen
4b0badc92d
am 3a14eeb5: Bit of code cleanup (issue 11648206)
...
* commit '3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd':
Bit of code cleanup (issue 11648206)
2013-11-15 10:22:05 -08:00
Adam Cohen
2dc25b186e
am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
...
* commit '202e4fdafb5e4e94dd925905c1553bd92e61985e':
Fix for transparent CustomContent screen (issue 11549096)
2013-11-15 10:22:04 -08:00
Winson Chung
1aca70a536
am b427f30e: Merge "Require valid arrays when adding and binding new Apps. (Bug 11627095)" into jb-ub-now-jolly-elf
...
* commit 'b427f30e4da1141ec0266cfad8cbfb63a1760bc6':
Require valid arrays when adding and binding new Apps. (Bug 11627095)
2013-11-15 10:22:02 -08:00
Winson Chung
3a7bea5981
am 89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
...
* commit '89ee93e0f8b6ac1ed6aefc2b940d1606f2027491':
Use the icon bounds for all calculations.
2013-11-15 10:22:01 -08:00
Adam Cohen
b6186d2bbe
am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf
...
* commit '4e2683a4b582d28bb320308b5e5f3541ae1aa310':
Fix issue where custom content would be invisible (issue 11644432)
2013-11-15 10:21:59 -08:00
Adam Cohen
a9f8aeeb07
am e9b198fd: Merge "Change the way view ids are assigned (issue 11627801)" into jb-ub-now-jolly-elf
...
* commit 'e9b198fd7414771db3df259ce696f0070ea9a153':
Change the way view ids are assigned (issue 11627801)
2013-11-15 10:21:56 -08:00
Adam Copp
ee7f46cbd6
am 3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
...
* commit '3dc3ecda281c078de9511dcb6349db1df629220a':
Hooks for subclasses to react to home presses.
2013-11-15 09:24:15 -08:00
Adam Cohen
582a36949b
Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
2013-11-15 17:09:23 +00:00
Adam Cohen
3a14eeb54e
Bit of code cleanup (issue 11648206)
...
Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
2013-11-15 17:03:49 +00:00
Adam Cohen
cb0468facb
am b79a48c2: Merge "Add logging for NPE (issue 11627249)" into jb-ub-now-jolly-elf
...
* commit 'b79a48c251947d4bceb289953485f2aef6e55852':
Add logging for NPE (issue 11627249)
2013-11-15 08:50:13 -08:00
Adam Cohen
6641570ec1
am 17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue 11627191)" into jb-ub-now-jolly-elf
...
* commit '17e1aeac4bcc15a53eb0e2139d8690aa788a4320':
Fix CellLayout UNSPECIFIED exception (issue 11627191)
2013-11-15 08:50:12 -08:00
Winson Chung
a73c1fac3d
am e248b837: Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)" into jb-ub-now-jolly-elf
...
* commit 'e248b83797e6b6ce128085560ad0c5b900413bf2':
Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)
2013-11-15 08:50:04 -08:00
Adam Cohen
202e4fdafb
Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf
2013-11-15 13:21:05 +00:00
Adam Cohen
1774a8a0c6
Fix for transparent CustomContent screen (issue 11549096)
...
Change-Id: I8b371e3c556a80b7eb3e145a8d4b78f15421046a
2013-11-15 13:16:43 +00:00
Winson Chung
b38002419d
Adding method to get the search bar bounds.
...
Change-Id: Iec2fe0992cc666432ba6b9eac7ee8bf63e49b146
2013-11-14 14:15:06 -08:00