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
933cc50611
Merge "Reverting: "Animating the drag view scale up and down when dragging items.""
2012-02-13 13:13:31 -08:00
a1cdab0392
Reverting: "Animating the drag view scale up and down when dragging items."
...
Change-Id: I133ff2631834a4b97e1e4750fb7c07793ddeba69
2012-02-13 13:03:52 -08:00
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
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
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
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
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
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
6e2dae9906
Merge "Cleaning up extra line related to icon density change." into ics-scoop
2012-02-13 12:37:02 -08:00
35003b7df7
Cleaning up extra line related to icon density change.
...
Change-Id: I3a8849a5800af1f04f097c4ce55ecf5d97292f4c
2012-02-13 12:28:29 -08:00
af23500cf9
Should be getting launcher icon DPI from ActivityManager.
...
Change-Id: Iec1b375568b421220fdbf08de6e7a697d0488e24
2012-02-13 12:27:49 -08:00
7fccbe9f6f
merge in jb-release history after reset to master
2012-02-13 09:01:33 -08:00
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
9659d0c3a5
Merge "Animating the drag view scale up and down when dragging items."
2012-02-10 17:10:43 -08:00
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
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
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
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
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
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
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
3d9adfb03a
am fb314c77: Import translations. DO NOT MERGE
...
* commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c':
Import translations. DO NOT MERGE
2012-02-10 10:05:42 -08:00
876a43e361
am fb314c77: Import translations. DO NOT MERGE
...
* commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c':
Import translations. DO NOT MERGE
2012-02-10 10:05:11 -08:00
c63d21564a
am fb314c77: Import translations. DO NOT MERGE
...
* commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c':
Import translations. DO NOT MERGE
2012-02-10 10:05:10 -08:00
ddd4231bfd
am 33685002: Import translations. DO NOT MERGE
...
* commit '3368500217281a4325ddba76f01dfbe004cbb0e7':
Import translations. DO NOT MERGE
2012-02-09 09:53:12 -08:00
3368500217
Import translations. DO NOT MERGE
...
Change-Id: Id02b402e43336a5395e92b25c7e688ae5fbfd86d
2012-02-09 09:48:58 -08:00
fb314c7782
Import translations. DO NOT MERGE
...
Change-Id: Ia1e288e37af91e079027d742c389a6ce10bd247c
2012-02-08 18:10:33 -08:00
42c29aedf2
Animating the drag view scale up and down when dragging items.
...
- Also fixing up how we draw the drag view alpha
Change-Id: Ied82aec9d52274b0fe65c989eab818b0264a9eb2
2012-02-07 16:16:27 -08:00
73d8b5d734
merge in jb-release history after reset to master
2012-02-06 07:03:02 -08:00
3afd4f52e9
am 6af9af05: Fix issue where launcher didn\'t return to workspace on screen off (issue 5628744)
...
* commit '6af9af057f2e40c54a4ed447c4628eef7dc15683':
Fix issue where launcher didn't return to workspace on screen off (issue 5628744)
2012-02-02 15:54:30 -08:00
6af9af057f
Fix issue where launcher didn't return to workspace on screen off (issue 5628744)
...
Change-Id: Ic058cf7a803d2fe7be98325138cd5bd52a96cd9c
2012-02-02 15:41:45 -08:00
eca7a72c3a
am af0d8cea: am c3307f7b: am 230d4c23: Reconcile with ics-mr1-release
...
* commit 'af0d8cea311d527aaf7e5f014b1c864fee6b882d':
2012-02-01 10:10:14 -08:00
af0d8cea31
am c3307f7b: am 230d4c23: Reconcile with ics-mr1-release
...
* commit 'c3307f7b61ae37aa26a05b37604a04c9c2e47f19':
2012-02-01 10:06:20 -08:00
c3307f7b61
am 230d4c23: Reconcile with ics-mr1-release
...
* commit '230d4c236982058767225f59ad6b5a3fc3f638b6':
2012-02-01 10:01:23 -08:00
230d4c2369
Reconcile with ics-mr1-release
...
Change-Id: Ie670c123d7fe636bc2a6b441c4b42f74b1f326bc
2012-02-01 08:50:37 -08:00
2402c883f3
merge in jb-release history after reset to master
2012-02-01 07:02:31 -08:00
7ed8ebac7f
am f697057f: Import translations. DO NOT MERGE
...
* commit 'f697057f4209f66da91afb1cfdcf39d53e82f6a2':
Import translations. DO NOT MERGE
2012-01-31 12:59:30 -08:00
f697057f42
Import translations. DO NOT MERGE
...
Change-Id: Id41d1202b296afab21c89c830a3be74cc87273ff
2012-01-31 11:18:38 -08:00
c26ee6a13d
merge in jb-release history after reset to master
2012-01-31 07:02:14 -08:00
1901168f8a
am 10392b50: Merge "Fixing issue where AllApps icon would stay dimmed after pressing it (but not launching or long pressing)."
...
* commit '10392b50c9a3e7dc1c1b251ec2e879c25ab21ea6':
Fixing issue where AllApps icon would stay dimmed after pressing it (but not launching or long pressing).
2012-01-30 17:55:27 -08:00
6f3267318f
am 8a2d3e6a: Merge "Fixing two regressions in which side pages were not drawn or oriented correctly."
...
* commit '8a2d3e6a29f3ee009b40904dbd36d2ea622d5750':
Fixing two regressions in which side pages were not drawn or oriented correctly.
2012-01-30 17:55:27 -08:00
10392b50c9
Merge "Fixing issue where AllApps icon would stay dimmed after pressing it (but not launching or long pressing)."
2012-01-30 17:53:59 -08:00
8a2d3e6a29
Merge "Fixing two regressions in which side pages were not drawn or oriented correctly."
2012-01-30 17:53:44 -08:00
b33e05fa50
Fixing two regressions in which side pages were not drawn or oriented correctly.
...
Change-Id: Ib936d7701c8962fc04e6fed2e3d624291fe8fc46
2012-01-30 17:20:47 -08:00
822d331692
am ff13de81: Fixing missing background for market button on tablets.
...
* commit 'ff13de81e3f599470bb3e60fb6c5aef0d2d522a1':
Fixing missing background for market button on tablets.
2012-01-30 16:56:11 -08:00
ff13de81e3
Fixing missing background for market button on tablets.
...
Change-Id: I222d5a190d046a6a4b940fdbe6cb5f911e8ab771
2012-01-30 16:27:48 -08:00
3b187b88ba
Fixing issue where AllApps icon would stay dimmed after pressing it (but not launching or long pressing).
...
Change-Id: If60fd76cd1fbef0b235c0a3d0870fd2da4c1b833
2012-01-30 15:11:50 -08:00
108c4a48df
merge in jb-release history after reset to master
2012-01-30 07:03:06 -08:00
e2a50ff34e
am 63f541d5: Import translations. DO NOT MERGE
...
* commit '63f541d52c7e5abc6a076213f62e806480f2026b':
Import translations. DO NOT MERGE
2012-01-27 12:03:38 -08:00
Winson Chung
Ramanan Rajeswaran
The Android Automerger
Eric Fischer
Adam Cohen
The Android Open Source Project