Michael Jurka
18b4f7798b
am f1a22399: am 2a5bc113: DO NOT MERGE
...
* commit 'f1a22399b17dbd32dd27cc0bc49211701b335735':
DO NOT MERGE
2012-02-14 20:13:50 -08:00
Michael Jurka
f1a22399b1
am 2a5bc113: DO NOT MERGE
...
* commit '2a5bc113b49b79c49281d5f8d8c1421d663d2ee4':
DO NOT MERGE
2012-02-14 20:12:24 -08:00
Michael Jurka
fd5892cebd
am 2a5bc113: DO NOT MERGE
...
* commit '2a5bc113b49b79c49281d5f8d8c1421d663d2ee4':
DO NOT MERGE
2012-02-14 20:12:11 -08:00
Winson Chung
15cf5093ce
Fixing issue where smallest screen dim was not taking dpi into account.
...
Change-Id: I1efacf693200f490c506050ce36403db224b5846
2012-02-14 17:54:44 -08:00
Michael Jurka
2a5bc113b4
DO NOT MERGE
...
Fixing animation glitch
Bug #6015450
Change-Id: Iebbce7c07816b51b0fb98cd5b83ca2af2e5f76d4
2012-02-14 17:46:22 -08:00
Adam Cohen
038085598c
Merge "Fixing annoying bug where widget would drop to side page"
2012-02-14 16:45:40 -08:00
Adam Cohen
82ac8a2488
Fixing annoying bug where widget would drop to side page
...
Change-Id: I7e8bf298e01666fe29abc322b45f2538569c5ed9
2012-02-14 16:27:49 -08:00
Winson Chung
78034235d1
Merge "Minimizing number of db calls when installing shortcut externally."
2012-02-14 14:59:36 -08:00
Winson Chung
2210d2ad0c
Merge "Animating the drag view scale up and down when dragging items."
2012-02-14 14:59:30 -08:00
Winson Chung
a61dc4290d
Fixing issue where smallest screen dim was not taking dpi into account.
...
Change-Id: I1efacf693200f490c506050ce36403db224b5846
2012-02-14 14:45:57 -08:00
Jean-Baptiste Queru
374c1bc10a
am e61d6d2d: (-s ours) Manual merge - DO NOT MERGE
...
* commit 'e61d6d2d8f91dfe570d4cba60b365c418dcc0fb9':
DO NOT MERGE
2012-02-14 14:28:36 -08:00
Jean-Baptiste Queru
e61d6d2d8f
Manual merge - DO NOT MERGE
...
Change-Id: I4b8ecbd575583544284c134579f8705f6dc1d2d6
2012-02-14 14:25:44 -08:00
The Android Automerger
39b3684e08
merge in ics-mr1-release history after reset to ics-mr1
2012-02-14 14:16:41 -08:00
Winson Chung
54d9fc2830
Merge "Revert "Speed up All Apps -> Workspace transition""
2012-02-14 13:38:35 -08:00
Michael Jurka
9753d13c7b
Revert "Speed up All Apps -> Workspace transition"
...
Temp fix for 5976264
This reverts commit 9433fa7eba
.
Change-Id: Ic49ffc818b9b233b3717b52a5f77eaac1e001f5b
2012-02-14 13:36:59 -08:00
Winson Chung
a308e0540a
DO NOT MERGE
...
Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change.
Change-Id: I5e8106d0f77545b80a0b21d4230cf826439ac371
2012-02-14 09:34:52 -08:00
Adam Cohen
941c56f100
am 55952e2f: Merge "Fixing bugs with new widget adding"
...
* commit '55952e2f531d7c1ce0a3b2d3131f7ac3d7c1a603':
Fixing bugs with new widget adding
2012-02-13 19:52:38 -08:00
Adam Cohen
55952e2f53
Merge "Fixing bugs with new widget adding"
2012-02-13 19:51:31 -08:00
Adam Cohen
1b36dc3f2b
Fixing bugs with new widget adding
...
-> widget ids were being reused in some cases
-> widgets could be added before springloaded mode was entered
Change-Id: Iaf3bffc49d4ec2de4b63db1b5cfb52b8544e9c2b
2012-02-13 19:50:10 -08:00
Winson Chung
7bd1bbb509
Animating the drag view scale up and down when dragging items.
...
Change-Id: Ic97d74a14964c6bdc23305b2d378b13a1f2e3664
2012-02-13 19:05:25 -08:00
Winson Chung
81d13aef47
am d83f5f4d: Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change.
...
* commit 'd83f5f4db328fbd152491bbf9fa13abc94bd6f25':
Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change.
2012-02-13 14:32:38 -08:00
Winson Chung
d83f5f4db3
Reverting: Change I3a8849a5: Cleaning up extra line related to icon density change.
...
Change-Id: I5e8106d0f77545b80a0b21d4230cf826439ac371
2012-02-13 14:29:05 -08:00
Ramanan Rajeswaran
83d6c9b647
am 08fc2344: am e25db70b: am d1dbfe35: Revert "Should be getting launcher icon DPI from ActivityManager."
...
* commit '08fc2344a46f6f42442a750048c4171839b02fe2':
Revert "Should be getting launcher icon DPI from ActivityManager."
2012-02-13 14:01:03 -08:00
Ramanan Rajeswaran
08fc2344a4
am e25db70b: am d1dbfe35: Revert "Should be getting launcher icon DPI from ActivityManager."
...
* commit 'e25db70be9743be72bf05ce0c8f7c3b80b3294c0':
Revert "Should be getting launcher icon DPI from ActivityManager."
2012-02-13 13:58:14 -08:00
Ramanan Rajeswaran
e25db70be9
am d1dbfe35: Revert "Should be getting launcher icon DPI from ActivityManager."
...
* commit 'd1dbfe356f045112310fb8ecc23a9c8cea7dbf50':
Revert "Should be getting launcher icon DPI from ActivityManager."
2012-02-13 13:56:25 -08:00
Ramanan Rajeswaran
d1dbfe356f
Revert "Should be getting launcher icon DPI from ActivityManager."
...
This reverts commit af23500cf9
.
2012-02-13 13:54:42 -08:00
Adam Cohen
a6ddb34ac8
am ed66b2ba: Improving widget transitions:
...
* commit 'ed66b2bac7447febe2e405b4ce725cae4f6b5988':
Improving widget transitions:
2012-02-13 13:43:56 -08:00
Adam Cohen
ed66b2bac7
Improving widget transitions:
...
-> 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
2012-02-13 13:30:32 -08:00
Winson Chung
b7bea81c7a
Minimizing number of db calls when installing shortcut externally.
...
- Fixing case where the drag view was persisting after drag failed from AllApps
Change-Id: Ia2439462b93f196f3fcba73814e0994e54600e70
2012-02-13 13:26:13 -08:00
Winson Chung
4a89537bd3
am 933cc506: Merge "Reverting: "Animating the drag view scale up and down when dragging items.""
...
* commit '933cc5061100f22c22d66d280b6fdd07634f45a6':
Reverting: "Animating the drag view scale up and down when dragging items."
2012-02-13 13:15:33 -08:00
Winson Chung
933cc50611
Merge "Reverting: "Animating the drag view scale up and down when dragging items.""
2012-02-13 13:13:31 -08:00
Winson Chung
a1cdab0392
Reverting: "Animating the drag view scale up and down when dragging items."
...
Change-Id: I133ff2631834a4b97e1e4750fb7c07793ddeba69
2012-02-13 13:03:52 -08:00
Ramanan Rajeswaran
3928125a58
am eaa7737d: am b4215be9: am 6e2dae99: Merge "Cleaning up extra line related to icon density change." into ics-scoop
...
* commit 'eaa7737d77013e91a5816c85332e4f5f3dd2041f':
Cleaning up extra line related to icon density change.
2012-02-13 12:44:55 -08:00
Winson Chung
0200cd9ac7
am 1016ce5d: am 94a1af88: am af23500c: Should be getting launcher icon DPI from ActivityManager.
...
* commit '1016ce5d298c021708008ca39c762e5e3b9d0d0d':
Should be getting launcher icon DPI from ActivityManager.
2012-02-13 12:44:55 -08:00
Ramanan Rajeswaran
eaa7737d77
am b4215be9: am 6e2dae99: Merge "Cleaning up extra line related to icon density change." into ics-scoop
...
* commit 'b4215be91155dd813a272e57f72b5c7a5cf69857':
Cleaning up extra line related to icon density change.
2012-02-13 12:41:30 -08:00
Winson Chung
1016ce5d29
am 94a1af88: am af23500c: Should be getting launcher icon DPI from ActivityManager.
...
* commit '94a1af88fb7f58162b05af70bec16f91eae983e4':
Should be getting launcher icon DPI from ActivityManager.
2012-02-13 12:41:29 -08:00
Ramanan Rajeswaran
b4215be911
am 6e2dae99: Merge "Cleaning up extra line related to icon density change." into ics-scoop
...
* commit '6e2dae99061758d205034bd0ddcc1e15828e8acc':
Cleaning up extra line related to icon density change.
2012-02-13 12:38:39 -08:00
Winson Chung
94a1af88fb
am af23500c: Should be getting launcher icon DPI from ActivityManager.
...
* commit 'af23500cf9eb9c05ae0b2a0ea63c96534e648004':
Should be getting launcher icon DPI from ActivityManager.
2012-02-13 12:38:38 -08:00
Ramanan Rajeswaran
6e2dae9906
Merge "Cleaning up extra line related to icon density change." into ics-scoop
2012-02-13 12:37:02 -08:00
Winson Chung
35003b7df7
Cleaning up extra line related to icon density change.
...
Change-Id: I3a8849a5800af1f04f097c4ce55ecf5d97292f4c
2012-02-13 12:28:29 -08:00
Winson Chung
af23500cf9
Should be getting launcher icon DPI from ActivityManager.
...
Change-Id: Iec1b375568b421220fdbf08de6e7a697d0488e24
2012-02-13 12:27:49 -08:00
Winson Chung
7048966a16
am 9659d0c3: Merge "Animating the drag view scale up and down when dragging items."
...
* commit '9659d0c3a5c29f880bc12d1051e3e3beae2d4a87':
Animating the drag view scale up and down when dragging items.
2012-02-10 17:12:28 -08:00
Winson Chung
9659d0c3a5
Merge "Animating the drag view scale up and down when dragging items."
2012-02-10 17:10:43 -08:00
Eric Fischer
9e12bb9727
am 99bc4b92: am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp
...
* commit '99bc4b92a42a9db428d4f0519dfbab4d4a519ed9':
2012-02-10 10:15:46 -08:00
Eric Fischer
0197acb26a
am 9d3ecb7d: am 5412bc99: (-s ours) am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGE
...
* commit '9d3ecb7dfa8fc689709c836ce78ae76e5d27f80d':
Import translations. DO NOT MERGE
2012-02-10 10:13:29 -08:00
Eric Fischer
99bc4b92a4
am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp
...
* commit 'a2319e198b98fec50020974be310ae873519fa54':
2012-02-10 10:13:18 -08:00
Eric Fischer
9d3ecb7dfa
am 5412bc99: (-s ours) am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGE
...
* commit '5412bc993124ae5ce72a6ac88fd942ba3f43eca4':
Import translations. DO NOT MERGE
2012-02-10 10:11:00 -08:00
Eric Fischer
a2319e198b
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp
2012-02-10 10:08:55 -08:00
Eric Fischer
5412bc9931
am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGE
...
* commit '3d9adfb03a4953eef3ba8596d9dd7a69486bf2e6':
Import translations. DO NOT MERGE
2012-02-10 10:08:35 -08:00
Eric Fischer
9497779888
am 876a43e3: (-s ours) am fb314c77: Import translations. DO NOT MERGE
...
* commit '876a43e36112d192f1ecf4b768afc619d775389c':
Import translations. DO NOT MERGE
2012-02-10 10:08:29 -08:00