summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 18428a79: Merge "Updating Clings. (5057945, 5056643)" into ics-factoryromAdam Cohen2011-09-1954-332/+513
|\ | | | | | | | | * commit '18428a79810761e68d93eeb33d6032d84abdd25a': Updating Clings. (5057945, 5056643)
| * Merge "Updating Clings. (5057945, 5056643)" into ics-factoryromAdam Cohen2011-09-1954-332/+513
| |\
| | * Updating Clings. (5057945, 5056643)Winson Chung2011-09-1854-332/+513
| | | | | | | | | | | | Change-Id: Ifb2d37e92495aeddf9d4b3277eb8d2a846f4aa99
* | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I494a93ba774ff98969c412d4a9f07f21ef683cde
| * \ \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-190-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-180-0/+0
| | |\ \
* | | | | am e5d77260: Tweaking search bar padding a little more. (5051804)Winson Chung2011-09-182-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5d772603be1187fd2467c273ffc82f142c2cd2c': Tweaking search bar padding a little more. (5051804)
| * | | | Tweaking search bar padding a little more. (5051804)Winson Chung2011-09-182-5/+5
| | |_|/ | |/| | | | | | | | | | Change-Id: I43f17448ec774c0505c0ec22bc2c49e376d6a623
* | | | am 23409c2a: Merge "Fixing up search bar and adding bg. (5051804)" into ↵Winson Chung2011-09-185-9/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ics-factoryrom * commit '23409c2a1247a7531348ab1c114eca959d78b37f': Fixing up search bar and adding bg. (5051804)
| * | | Merge "Fixing up search bar and adding bg. (5051804)" into ics-factoryromWinson Chung2011-09-185-9/+10
| |\ \ \
| | * | | Fixing up search bar and adding bg. (5051804)Winson Chung2011-09-185-9/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifeada9f2e8c1cd801a099f355c73fdac5300e11a
* | | | | am 31e8624c: Merge "Fixing widget minResizeWidth/Height interpretation ↵Adam Cohen2011-09-182-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Issue 5327589)" into ics-factoryrom * commit '31e8624c4535e995d80d3df47823c1981ef71b70': Fixing widget minResizeWidth/Height interpretation (Issue 5327589)
| * | | | Merge "Fixing widget minResizeWidth/Height interpretation (Issue 5327589)" ↵Adam Cohen2011-09-182-3/+9
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into ics-factoryrom
| | * | | Fixing widget minResizeWidth/Height interpretation (Issue 5327589)Adam Cohen2011-09-162-3/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I16bf9bb20baad4fa1e0676d98bb93de758af0ebc
* | | | | am 9627936d: Merge "Updating the qsb. (5051804)" into ics-factoryromWinson Chung2011-09-1832-27/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '9627936d4f4fd4ec089f121db4aaf387545d843f': Updating the qsb. (5051804)
| * | | | Merge "Updating the qsb. (5051804)" into ics-factoryromWinson Chung2011-09-1832-27/+39
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Updating the qsb. (5051804)Winson Chung2011-09-1632-27/+39
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f5745e64b96951d4ec8d5714389df7ebff30c81
* | | | | am a2d4c807: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-09-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit 'a2d4c80774ff0f47742d5e89a745028ec78d997e': Import revised translations. DO NOT MERGE
| * | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-1635-227/+131
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-09-1635-227/+131
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie3e41b3cff8b35c005d38f26dc2945dcab491ab7
* | | | | am 446e940f: Locking orientation on phones (issue 4967793)Adam Cohen2011-09-164-14/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '446e940fc8839173de12f1299b8c24f318d53a3f': Locking orientation on phones (issue 4967793)
| * | | | Locking orientation on phones (issue 4967793)Adam Cohen2011-09-154-14/+25
| |/ / / | | | | | | | | | | | | Change-Id: I6b5fe63547f43c408feea75f35dc0a08d06c258c
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-160-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Change-Id: I39b34b82f9b4b75545f997ed80b95f65f90ba4c4
| * | DO NOT MERGE: Fixing regression where scroll position would be offset when ↵Winson Chung2011-09-1512-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | rotated. - Fixes the scrolling issue only in conjunction with framework measure fix - Updating the wallpaper gallery item background Change-Id: I156de59a3eadfdaa61018c0a74ad0614d76cde6d
* | | Merge branch 'master' of ↵Martijn Coenen2011-09-150-0/+0
|\ \ \ | |_|/ |/| | | | | ssh://android-git:29418/platform/packages/apps/Launcher2
| * | Fixing regression where scroll position would be offset when rotated.Winson Chung2011-09-1412-9/+33
| |/ | | | | | | | | | | | | - Fixes the scrolling issue only in conjunction with framework measure fix - Updating the wallpaper gallery item background Change-Id: Id7ff602837dbe1d8a2aaec6ec49b667f11d01bc9
* / DO NOT MERGE: Fixing regression where scroll position would be offset when ↵Winson Chung2011-09-1512-9/+33
|/ | | | | | | | | rotated. - Fixes the scrolling issue only in conjunction with framework measure fix - Updating the wallpaper gallery item background Change-Id: I156de59a3eadfdaa61018c0a74ad0614d76cde6d
* Merge "Disable tap to switch pages on phones"Michael Jurka2011-09-141-2/+8
|\
| * Disable tap to switch pages on phonesMichael Jurka2011-09-141-2/+8
| | | | | | | | Change-Id: I15b911c2785df5aa124814c6128523042104b4da
* | Tuning AllApps <--> Workspace transitionsAdam Cohen2011-09-144-43/+63
|/ | | | | | -> Removed extraneous service transactions during scrolling Change-Id: I60a201e7a94608d6fbafd2350f39a466d7a4c003
* Fixing build.Winson Chung2011-09-141-1/+1
| | | | Change-Id: Ib76ed00be3b81231b782f83a3dd13c6dc40d6439
* Updating assets.Winson Chung2011-09-1495-17/+14
| | | | Change-Id: Ieab9698bbbe94a3087c9f405c4318f5575e2a842
* Merge "Disable fading of side pages on phones. (5270754)"Winson Chung2011-09-135-13/+19
|\
| * Disable fading of side pages on phones. (5270754)Winson Chung2011-09-135-13/+19
| | | | | | | | | | | | - Fixing small issue with scroll bars not aligning properly. Change-Id: I000c0b7a26d7e6295d131646be81491a357ffdce
* | Fixing regression with widget sizesAdam Cohen2011-09-131-2/+1
| | | | | | | | Change-Id: Id013ceaaf08ce2bfddd997b49843384082bc6834
* | Fix blip in AllApps transitionAdam Cohen2011-09-121-2/+5
| | | | | | | | Change-Id: I599867712796b5ec0e0523f3dbcf11b50e012d93
* | Fixing bug where wallpaper disappearsAdam Cohen2011-09-121-1/+9
| | | | | | | | Change-Id: I50f57a9cec20079c36c65f85243c1c4bc16c7fb8
* | Merge "Fix regression: QSB is not clickable"Michael Jurka2011-09-121-4/+4
|\ \
| * | Fix regression: QSB is not clickableMichael Jurka2011-09-121-4/+4
| | | | | | | | | | | | Change-Id: I7e3d17d59237f4f3ad4820fa0a43bad7624c6b45
* | | Merge "Fixing NPE in LauncherAppWidgetHostView, issue 5270711"Michael Jurka2011-09-121-3/+7
|\ \ \ | |_|/ |/| |
| * | Fixing NPE in LauncherAppWidgetHostView, issue 5270711Adam Cohen2011-09-111-3/+7
| |/ | | | | | | Change-Id: Iefe70bc362e2a6540b497412f349e15d9a3120cb
* | Merge "Reverting change to load workspace items in reverse order. (5290651)"Winson Chung2011-09-121-2/+1
|\ \
| * | Reverting change to load workspace items in reverse order. (5290651)Winson Chung2011-09-121-2/+1
| | | | | | | | | | | | Change-Id: I6bc5e4ccac12a5a1098721eccb0d6ccede699b42
* | | Merge "Import revised translations."Eric Fischer2011-09-1246-102/+102
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-09-1246-102/+102
| |/ | | | | | | Change-Id: I7e879e56a715011a1f9bfb0a2b4e8b6d0b3e4f66
* | Workspace overscroll effectAdam Cohen2011-09-1112-107/+193
| | | | | | | | | | | | -> Made AllAppsCustomize scroll/over scroll more subtle Change-Id: Icf1889b3adccce22d4a2d80c5b487518b0ab3157
* | Bounding scroll bar to the track to prevent overscrolling.Winson Chung2011-09-091-1/+3
|/ | | | Change-Id: I2db815e072dcf41dda8102829d136fc2dca588e7
* Merge "Fixing small regression where dropping from a folder causes the ↵Winson Chung2011-09-091-0/+2
|\ | | | | | | search bar to flash."
| * Fixing small regression where dropping from a folder causes the search bar ↵Winson Chung2011-09-091-0/+2
| | | | | | | | | | | | to flash. Change-Id: Ifec899ea834ecd7526e5797bbda3a2feec1f9e8c
* | We were too clever! Restoring the default folder name.Winson Chung2011-09-092-2/+3
|/ | | | Change-Id: I363328040be78e395abf1903212c93b8bbe54f08