summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am 76980e33: Merge "Fix binding problem with no screens (issue 11768766)" ↵Adam Cohen2013-11-281-21/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-ub-now-jolly-elf * commit '76980e33978b3d1aa1fd870e98995c713ba2e1d0': Fix binding problem with no screens (issue 11768766)
| * | | | Merge "Fix binding problem with no screens (issue 11768766)" into ↵Adam Cohen2013-11-271-21/+7
| |\ \ \ \ | | |/ / / | |/| | | | | | | | jb-ub-now-jolly-elf
| | * | | Fix binding problem with no screens (issue 11768766)Adam Cohen2013-11-271-21/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I0a296892d4964913f38bf6d7bd2c2b17e1e0e8e0
* | | | | am 6400b84d: Update custom content insets when Workspace insets are setAdam Cohen2013-11-281-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6400b84d5594d7b9244e3b118f107033eb8b87a0': Update custom content insets when Workspace insets are set
| * | | | Update custom content insets when Workspace insets are setAdam Cohen2013-11-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> Not sure if custom content can be added before insets are set, so this is just a speculative fix. Bug: 11875171 Change-Id: Ia8e07f51f527f464262b7ff99e4db245fe5a7906
* | | | | Generalize support for 'App Info', 'Uninstall' and 'Delete'Mathew Inwood2013-11-286-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows other DragSource's to allow this behaviour, instead of it being tied to specific source types. Change-Id: I06b7c39b1b34a0ae141245bcc13b6a0873a4c0fd
* | | | | am 166ebd4d: De-parent custom content view before adding to custom content ↵Adam Cohen2013-11-261-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen * commit '166ebd4da5d85195bd1f562572f468726ade548f': De-parent custom content view before adding to custom content screen
| * | | | De-parent custom content view before adding to custom content screenAdam Cohen2013-11-261-0/+6
| |/ / / | | | | | | | | | | | | | | | | Bug: 11666352 Change-Id: Ief35e6e8a16ec0217e0dd27434723ee7a7d5beef
* | | | am d552dd90: Fix NPE in Launcher onDestroyAdam Cohen2013-11-261-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'd552dd90f1da32e1be2dd95ffed57c65d40cb651': Fix NPE in Launcher onDestroy
| * | | Fix NPE in Launcher onDestroyAdam Cohen2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 11765296 Change-Id: I83299656cc90b8a744afb0db4b5ea08675c8db82
* | | | am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher ↵Adam Cohen2013-11-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | has been destroyed " into jb-ub-now-jolly-elf * commit '060a48378f21a6b5836990a23178d02c94fccc60': Fix NPE in case where workspace is null because Launcher has been destroyed
| * | | Merge "Fix NPE in case where workspace is null because Launcher has been ↵Adam Cohen2013-11-261-1/+1
| |\ \ \ | | | | | | | | | | | | | | | destroyed " into jb-ub-now-jolly-elf
| | * | | Fix NPE in case where workspace is null because Launcher has been destroyed Adam Cohen2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 11765964 Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
* | | | | am a6a296ba: Revert "Enable Launcher2 workspace import."Dan Sandler2013-11-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6a296ba1ffba6c5b98e92f05254f0317f28290b': Revert "Enable Launcher2 workspace import."
| * | | | Revert "Enable Launcher2 workspace import."Dan Sandler2013-11-261-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit 5b3bdd394e4401d7e91d528ef1d424d1af271d97. Bug: 11768766 Bug: 9832552
* | | | am 04a231bb: Merge "Making workspace->overview transition smoother" into ↵Michael Jurka2013-11-261-22/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-jolly-elf * commit '04a231bbe44e9af184e76f124430a5bf7ae8ac8a': Making workspace->overview transition smoother
| * | | Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elfMichael Jurka2013-11-261-22/+24
| |\ \ \
| | * | | Making workspace->overview transition smootherMichael Jurka2013-11-251-22/+24
| | | | | | | | | | | | | | | - Also set interpolator on page indicators
* | | | | am cccfe95b: Merge "Allowing ability to pick up items / enter overview ↵Adam Cohen2013-11-262-9/+3
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | before full page settle" into jb-ub-now-jolly-elf * commit 'cccfe95beb2de07fb3aef19e99e975e3a01cd055': Allowing ability to pick up items / enter overview before full page settle
| * | | Merge "Allowing ability to pick up items / enter overview before full page ↵Adam Cohen2013-11-252-9/+3
| |\ \ \ | | | | | | | | | | | | | | | settle" into jb-ub-now-jolly-elf
| | * | | Allowing ability to pick up items / enter overview before full page settleAdam Cohen2013-11-182-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> 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
* | | | | am 5b3bdd39: Enable Launcher2 workspace import.Dan Sandler2013-11-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5b3bdd394e4401d7e91d528ef1d424d1af271d97': Enable Launcher2 workspace import.
| * | | | Enable Launcher2 workspace import.Dan Sandler2013-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11800663 Change-Id: I5c8963bde69e667bf726d1f926a913c347294e16
* | | | | Merge "Add support for initiating a drag from an overlay." into jb-ub-now-kermitMathew Inwood2013-11-214-4/+31
|\ \ \ \ \
| * | | | | Add support for initiating a drag from an overlay.Mathew Inwood2013-11-204-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an overlay to create apps and shortcuts on the home screen. Change-Id: I63ee4ef02db3f4bc89726c394fd55ad26f50452c
* | | | | | am 2c130e1f: Reducing workspace grid for dogfooding.Winson Chung2013-11-191-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '2c130e1f293c67275d78c862e3240a47fea0e2e7': Reducing workspace grid for dogfooding.
| * | | | | Reducing workspace grid for dogfooding.Winson Chung2013-11-191-2/+2
| | | | | |
* | | | | | am 6dc8f7c8: Merge "Update the database when converting the final screen. ↵Winson Chung2013-11-191-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf * commit '6dc8f7c856f51223213c4106ebe9320f15f01013': Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
| * | | | | Merge "Update the database when converting the final screen. (Bug 11683562, ↵Winson Chung2013-11-191-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Bug 11034205)" into jb-ub-now-jolly-elf
| | * | | | | Update the database when converting the final screen. (Bug 11683562, Bug ↵Winson Chung2013-11-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 11034205)
* | | | | | | am f0b8dacf: Disable importing workspaces from Launcher2.Dan Sandler2013-11-192-23/+34
|\| | | | | | | |_|/ / / / |/| | | | | | | | | | | | | | | | | * commit 'f0b8dacf1516e0d901c71109c906dc15ef855fc5': Disable importing workspaces from Launcher2.
| * | | | | Disable importing workspaces from Launcher2.Dan Sandler2013-11-192-23/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 9832552 Bug: 11761032 Change-Id: I4dfd16046e9d6d0d1d864dff4340b0ed13cc8b8f
* | | | | am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elfWinson Chung2013-11-185-26/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '540efef758eb3bcf3bafe2241a4e3652a0e22c56': Initialize FastBitmapDrawable bounds with default bitmap dimensions. Updating LauncherModel filtering to use screen ids. (Bug 11685286)
| * | | | Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elfWinson Chung2013-11-185-26/+38
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * changes: Initialize FastBitmapDrawable bounds with default bitmap dimensions. Updating LauncherModel filtering to use screen ids. (Bug 11685286)
| | * | | Initialize FastBitmapDrawable bounds with default bitmap dimensions.Winson Chung2013-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida9603e35b242a581b9401c6440875cd511725a1
| | * | | Updating LauncherModel filtering to use screen ids. (Bug 11685286)Winson Chung2013-11-154-26/+37
| | |/ / | | | | | | | | | | | | | | | | | | | | - Fixes the issue with the current page not synchronously binding Change-Id: I3dfa45cc1777f846c77f3e86059dfb715553e1a3
* | | | am f9618856: Syncing up state transition with paging transitionAdam Cohen2013-11-185-147/+606
|\| | | | | | | | | | | | | | | | | | | * commit 'f9618856d6910ac385ad37762f9f067ae59a8622': Syncing up state transition with paging transition
| * | | Syncing up state transition with paging transitionAdam Cohen2013-11-185-147/+606
| |/ / | | | | | | | | | Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e
* | | am 603d19a3: Merge "Additional logs to track down missing workspace screen. ↵Winson Chung2013-11-151-0/+16
|\| | | | | | | | | | | | | | | | | | | | (Bug 11683562)" into jb-ub-now-jolly-elf * commit '603d19a333d53f537591107751b327cfc7b856fc': Additional logs to track down missing workspace screen. (Bug 11683562)
| * | Merge "Additional logs to track down missing workspace screen. (Bug ↵Winson Chung2013-11-151-0/+16
| |\ \ | | | | | | | | | | | | 11683562)" into jb-ub-now-jolly-elf
| | * | Additional logs to track down missing workspace screen. (Bug 11683562)Winson Chung2013-11-151-0/+16
| | | | | | | | | | | | | | | | Change-Id: I4f6b3c3ae07e2069bad01940dfce6bdc9cdb0ae0
* | | | am 28b690ab: Merge "Adding logs to track down missing workspace screen. (Bug ↵Winson Chung2013-11-154-0/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 11683562)" into jb-ub-now-jolly-elf * commit '28b690ab8e21d28ae5ebdea32475d3f1952203a5': Adding logs to track down missing workspace screen. (Bug 11683562)
| * | | Merge "Adding logs to track down missing workspace screen. (Bug 11683562)" ↵Winson Chung2013-11-154-0/+52
| |\| | | | | | | | | | | | | | into jb-ub-now-jolly-elf
| | * | Adding logs to track down missing workspace screen. (Bug 11683562)Winson Chung2013-11-154-0/+52
| | | | | | | | | | | | | | | | Change-Id: I12ef3331ab81004c75229d33afa0a8dd0fa8521c
* | | | am 582a3694: Merge "Adding method to get the search bar bounds." into ↵Adam Cohen2013-11-153-662/+719
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | jb-ub-now-jolly-elf * commit '582a36949b4e86feedaaceea0ae0f96dc746640c': Adding method to get the search bar bounds.
| * | | Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elfAdam Cohen2013-11-153-662/+719
| |\ \ \
| | * | | Adding method to get the search bar bounds.Winson Chung2013-11-143-662/+719
| | |/ / | | | | | | | | | | | | Change-Id: Iec2fe0992cc666432ba6b9eac7ee8bf63e49b146
* | | | am 3a14eeb5: Bit of code cleanup (issue 11648206)Adam Cohen2013-11-151-0/+5
|\| | | | | | | | | | | | | | | | | | | * commit '3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd': Bit of code cleanup (issue 11648206)
| * | | Bit of code cleanup (issue 11648206)Adam Cohen2013-11-151-0/+5
| | | | | | | | | | | | | | | | Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
* | | | am 202e4fda: Merge "Fix for transparent CustomContent screen (issue ↵Adam Cohen2013-11-151-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 11549096)" into jb-ub-now-jolly-elf * commit '202e4fdafb5e4e94dd925905c1553bd92e61985e': Fix for transparent CustomContent screen (issue 11549096)