summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am 18b4f779: (-s ours) am f1a22399: am 2a5bc113: DO NOT MERGEMichael Jurka2012-02-150-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | * commit '18b4f7798becb81e75359dae466e0c9876ff6861': DO NOT MERGE
| * | | | | | am f1a22399: am 2a5bc113: DO NOT MERGEMichael Jurka2012-02-141-1/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'f1a22399b17dbd32dd27cc0bc49211701b335735': DO NOT MERGE
| | * | | | | am 2a5bc113: DO NOT MERGEMichael Jurka2012-02-141-1/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '2a5bc113b49b79c49281d5f8d8c1421d663d2ee4': DO NOT MERGE
| | | * | | | DO NOT MERGEMichael Jurka2012-02-141-1/+2
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing animation glitch Bug #6015450 Change-Id: Iebbce7c07816b51b0fb98cd5b83ca2af2e5f76d4
* | | | | | Merge "Fixing annoying bug where widget would drop to side page"Adam Cohen2012-02-141-2/+1
|\ \ \ \ \ \
| * | | | | | Fixing annoying bug where widget would drop to side pageAdam Cohen2012-02-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e8bf298e01666fe29abc322b45f2538569c5ed9
* | | | | | | Merge "Minimizing number of db calls when installing shortcut externally."Winson Chung2012-02-141-12/+19
|\ \ \ \ \ \ \
| * | | | | | | Minimizing number of db calls when installing shortcut externally.Winson Chung2012-02-131-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing case where the drag view was persisting after drag failed from AllApps Change-Id: Ia2439462b93f196f3fcba73814e0994e54600e70
* | | | | | | | Merge "Animating the drag view scale up and down when dragging items."Winson Chung2012-02-1413-132/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | Animating the drag view scale up and down when dragging items.Winson Chung2012-02-1313-132/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic97d74a14964c6bdc23305b2d378b13a1f2e3664
* | | | | | | | | Fixing issue where smallest screen dim was not taking dpi into account.Winson Chung2012-02-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1efacf693200f490c506050ce36403db224b5846
* | | | | | | | | am e61d6d2d: (-s ours) Manual merge - DO NOT MERGEJean-Baptiste Queru2012-02-140-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e61d6d2d8f91dfe570d4cba60b365c418dcc0fb9': DO NOT MERGE
| * | | | | | | | Manual merge - DO NOT MERGEJean-Baptiste Queru2012-02-141-15/+7
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | Change-Id: I4b8ecbd575583544284c134579f8705f6dc1d2d6
| | * | | | | | | DO NOT MERGEWinson Chung2012-02-141-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change. Change-Id: I5e8106d0f77545b80a0b21d4230cf826439ac371
* | | | | | | | | Merge "Revert "Speed up All Apps -> Workspace transition""Winson Chung2012-02-145-90/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Speed up All Apps -> Workspace transition"Michael Jurka2012-02-145-90/+77
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temp fix for 5976264 This reverts commit 9433fa7ebad74320e39bfac6161a68bc850fe161. Change-Id: Ic49ffc818b9b233b3717b52a5f77eaac1e001f5b
* | | | | | | | | am 55952e2f: Merge "Fixing bugs with new widget adding"Adam Cohen2012-02-134-13/+35
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '55952e2f531d7c1ce0a3b2d3131f7ac3d7c1a603': Fixing bugs with new widget adding
| * | | | | | | | Merge "Fixing bugs with new widget adding"Adam Cohen2012-02-134-13/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fixing bugs with new widget addingAdam Cohen2012-02-134-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> widget ids were being reused in some cases -> widgets could be added before springloaded mode was entered Change-Id: Iaf3bffc49d4ec2de4b63db1b5cfb52b8544e9c2b
* | | | | | | | | am d83f5f4d: Reverting: Change I3a8849a5: Cleaning up extra line related to ↵Winson Chung2012-02-131-15/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icon density change. * commit 'd83f5f4db328fbd152491bbf9fa13abc94bd6f25': Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change.
| * | | | | | | | Reverting: Change I3a8849a5: Cleaning up extra line related to icon density ↵Winson Chung2012-02-131-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change. Change-Id: I5e8106d0f77545b80a0b21d4230cf826439ac371
* | | | | | | | | am 08fc2344: am e25db70b: am d1dbfe35: Revert "Should be getting launcher ↵Ramanan Rajeswaran2012-02-131-5/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icon DPI from ActivityManager." * commit '08fc2344a46f6f42442a750048c4171839b02fe2': Revert "Should be getting launcher icon DPI from ActivityManager."
| * | | | | | | | am e25db70b: am d1dbfe35: Revert "Should be getting launcher icon DPI from ↵Ramanan Rajeswaran2012-02-131-5/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | ActivityManager." * commit 'e25db70be9743be72bf05ce0c8f7c3b80b3294c0': Revert "Should be getting launcher icon DPI from ActivityManager."
| | * | | | | | am d1dbfe35: Revert "Should be getting launcher icon DPI from ActivityManager."Ramanan Rajeswaran2012-02-131-5/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1dbfe356f045112310fb8ecc23a9c8cea7dbf50': Revert "Should be getting launcher icon DPI from ActivityManager."
| | | * | | | | Revert "Should be getting launcher icon DPI from ActivityManager."Ramanan Rajeswaran2012-02-131-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af23500cf9eb9c05ae0b2a0ea63c96534e648004.
* | | | | | | | am ed66b2ba: Improving widget transitions:Adam Cohen2012-02-139-120/+464
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed66b2bac7447febe2e405b4ce725cae4f6b5988': Improving widget transitions:
| * | | | | | | Improving widget transitions:Adam Cohen2012-02-139-120/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> When a widget has no configuration activity, we bind and inflate it when the user picks it up. This allows us to smoothly transition between it's preview and some actual state of the widget when it is dropped. -> When a widget has a configuration activity, we delay the above process until the configuration activity has been run at which time we transition between the preview and the actual widget. Change-Id: I5265cd98400d70e5e75c3dcd21e322ed0b352d7b
* | | | | | | | am 933cc506: Merge "Reverting: "Animating the drag view scale up and down ↵Winson Chung2012-02-1311-87/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when dragging items."" * commit '933cc5061100f22c22d66d280b6fdd07634f45a6': Reverting: "Animating the drag view scale up and down when dragging items."
| * | | | | | | Merge "Reverting: "Animating the drag view scale up and down when dragging ↵Winson Chung2012-02-1311-87/+89
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | items.""
| | * | | | | | | Reverting: "Animating the drag view scale up and down when dragging items."Winson Chung2012-02-1311-87/+89
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I133ff2631834a4b97e1e4750fb7c07793ddeba69
* | | | | | | | am eaa7737d: am b4215be9: am 6e2dae99: Merge "Cleaning up extra line related ↵Ramanan Rajeswaran2012-02-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to icon density change." into ics-scoop * commit 'eaa7737d77013e91a5816c85332e4f5f3dd2041f': Cleaning up extra line related to icon density change.
| * | | | | | | am b4215be9: am 6e2dae99: Merge "Cleaning up extra line related to icon ↵Ramanan Rajeswaran2012-02-130-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | density change." into ics-scoop * commit 'b4215be91155dd813a272e57f72b5c7a5cf69857': Cleaning up extra line related to icon density change.
| | * | | | | | am 6e2dae99: Merge "Cleaning up extra line related to icon density change." ↵Ramanan Rajeswaran2012-02-131-1/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-scoop * commit '6e2dae99061758d205034bd0ddcc1e15828e8acc': Cleaning up extra line related to icon density change.
| | | * | | | | Merge "Cleaning up extra line related to icon density change." into ics-scoopRamanan Rajeswaran2012-02-131-1/+0
| | | |\ \ \ \ \
| | | | * | | | | Cleaning up extra line related to icon density change.Winson Chung2012-02-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a8849a5800af1f04f097c4ce55ecf5d97292f4c
* | | | | | | | | am 1016ce5d: am 94a1af88: am af23500c: Should be getting launcher icon DPI ↵Winson Chung2012-02-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from ActivityManager. * commit '1016ce5d298c021708008ca39c762e5e3b9d0d0d': Should be getting launcher icon DPI from ActivityManager.
| * | | | | | | | am 94a1af88: am af23500c: Should be getting launcher icon DPI from ↵Winson Chung2012-02-130-0/+0
| |\| | | | | | | | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityManager. * commit '94a1af88fb7f58162b05af70bec16f91eae983e4': Should be getting launcher icon DPI from ActivityManager.
| | * | | | | | am af23500c: Should be getting launcher icon DPI from ActivityManager.Winson Chung2012-02-131-11/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af23500cf9eb9c05ae0b2a0ea63c96534e648004': Should be getting launcher icon DPI from ActivityManager.
| | | * | | | | Should be getting launcher icon DPI from ActivityManager.Winson Chung2012-02-131-11/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec1b375568b421220fdbf08de6e7a697d0488e24
* | | | | | | am 9659d0c3: Merge "Animating the drag view scale up and down when dragging ↵Winson Chung2012-02-1011-89/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | items." * commit '9659d0c3a5c29f880bc12d1051e3e3beae2d4a87': Animating the drag view scale up and down when dragging items.
| * | | | | | Merge "Animating the drag view scale up and down when dragging items."Winson Chung2012-02-1011-89/+87
| |\ \ \ \ \ \
| | * | | | | | Animating the drag view scale up and down when dragging items.Winson Chung2012-02-0711-89/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also fixing up how we draw the drag view alpha Change-Id: Ied82aec9d52274b0fe65c989eab818b0264a9eb2
* | | | | | | | am 99bc4b92: am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ↵Eric Fischer2012-02-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp * commit '99bc4b92a42a9db428d4f0519dfbab4d4a519ed9':
| * | | | | | | am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ↵Eric Fischer2012-02-100-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp * commit 'a2319e198b98fec50020974be310ae873519fa54':
| | * | | | | | Merge branch 'ics-scoop-plus-aosp' of ↵Eric Fischer2012-02-107-28/+19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp
| | | * \ \ \ \ \ am 876a43e3: (-s ours) am fb314c77: Import translations. DO NOT MERGEEric Fischer2012-02-100-0/+0
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit '876a43e36112d192f1ecf4b768afc619d775389c': Import translations. DO NOT MERGE
| | | | * | | | | am fb314c77: Import translations. DO NOT MERGEEric Fischer2012-02-107-19/+28
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c': Import translations. DO NOT MERGE
* | | | | | | | | am 9d3ecb7d: am 5412bc99: (-s ours) am 3d9adfb0: am fb314c77: Import ↵Eric Fischer2012-02-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '9d3ecb7dfa8fc689709c836ce78ae76e5d27f80d': Import translations. DO NOT MERGE
| * | | | | | | | am 5412bc99: (-s ours) am 3d9adfb0: am fb314c77: Import translations. DO NOT ↵Eric Fischer2012-02-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE * commit '5412bc993124ae5ce72a6ac88fd942ba3f43eca4': Import translations. DO NOT MERGE
| | * | | | | | | am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGEEric Fischer2012-02-107-19/+28
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | / / | | | | |_|_|/ / | | | |/| | | | * commit '3d9adfb03a4953eef3ba8596d9dd7a69486bf2e6': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 21:35:27 +0000