2632ca01e1
Merge "Ensuring disabled apps don't appear in workspace (issue: 5557311)" into ics-mr1
2011-11-07 14:17:13 -08:00
85f3c470ab
am a0654a35: Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1
...
* commit 'a0654a3523cecfaa0800086753b8738ce3bc1d35':
Altering touch feedback for qsb assets. (Bug: 5560273)
2011-11-07 22:16:17 +00:00
a0654a3523
Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1
2011-11-07 14:14:55 -08:00
da06e31523
am f3a4562e: am 6c53e555: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'f3a4562e4a4af9f2cec3e98a8a01f5d50acba235':
Import revised translations. DO NOT MERGE
2011-11-07 20:45:45 +00:00
f3a4562e4a
am 6c53e555: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '6c53e555e9358ea41aec28d8098623a35f24e32f':
Import revised translations. DO NOT MERGE
2011-11-07 20:43:27 +00:00
e218dd37ac
am 6c53e555: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '6c53e555e9358ea41aec28d8098623a35f24e32f':
Import revised translations. DO NOT MERGE
2011-11-07 20:38:55 +00:00
6c53e555e9
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-07 12:36:39 -08:00
468dcdd27c
Import revised translations. DO NOT MERGE
...
Change-Id: I2e8275f3d8c160bf32154ec0d9f63fa34d077bf9
2011-11-07 12:26:48 -08:00
00fcb49a4c
Ensuring disabled apps don't appear in workspace (issue: 5557311)
...
Change-Id: I4a016b200945779f6e73b9c9d1c2a13c2b0fdef9
2011-11-07 11:13:19 -08:00
6af1d81f26
am 5974932d: Reconcile with ics-mr1-release
...
* commit '5974932dae85b553dc7b1598221037f502361fff':
2011-11-07 16:34:45 +00:00
5974932dae
Reconcile with ics-mr1-release
...
Change-Id: I89b1421563c2b3e43421e1a8c04b484b450f5327
2011-11-07 08:31:56 -08:00
4adc353cfe
merge in ics-release history after reset to master
2011-11-06 07:00:56 -08:00
f7388a7a00
merge in ics-mr1-release history after reset to ics-mr1
2011-11-06 06:46:39 -08:00
7e742a6541
am 8d0de22e: am acec6719: Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1
...
* commit '8d0de22e2010b5fb06fc0875e4add4e4f1f8b04f':
Cleaning up overscroll effect in launcher workspace
2011-11-05 19:36:13 +00:00
8d0de22e20
am acec6719: Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1
...
* commit 'acec6719208a59ccf32bfd4f46e383c9400945d9':
Cleaning up overscroll effect in launcher workspace
2011-11-05 19:33:34 +00:00
a345c52389
am acec6719: Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1
...
* commit 'acec6719208a59ccf32bfd4f46e383c9400945d9':
Cleaning up overscroll effect in launcher workspace
2011-11-04 21:02:04 +00:00
acec671920
Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1
2011-11-04 13:59:53 -07:00
3a23af59fb
am 5f08bf3a: Reconcile with ics-mr1-release
...
* commit '5f08bf3a059964d49ab02e10c1a6e1f0df50524d':
Tentative fix for monkey crash, issue 5556086
Updating default workspace, fixing missing Browser icon. (5358657)
Fixing regression where scroll position would be offset when rotated.
Fix regression: QSB is not clickable
Tagging where ItemInfos are created for debug purposes
Fix crash when package list is updated
Tweaking the logging in the fail case, adding additional cases for where the db icon cache should be updated. (5205131)
Fixing various issues with the dock.
Fix wallpaper picker crash
Fix crash on phones
2011-11-04 15:33:19 +00:00
5f08bf3a05
Reconcile with ics-mr1-release
...
Change-Id: I037563d8ac58380fbe57a781c0b9da3dd7b7c255
2011-11-04 08:31:36 -07:00
620542254c
Altering touch feedback for qsb assets. (Bug: 5560273)
...
- Removing some dead code
Change-Id: If6f3ffcf28249ca08c23089acb5bcd501b455119
2011-11-03 16:31:47 -07:00
21b411074e
Cleaning up overscroll effect in launcher workspace
...
-> Making sure workspace is drawn above the hotseat and qsb
-> Dimming the dock divider and page indicator during overscroll
Change-Id: I40766aa88e58db2d102c11d1ae8b2455aa459a07
2011-11-03 15:42:39 -07:00
136c67713b
merge in ics-release history after reset to master
2011-11-03 06:59:40 -07:00
2107d12aa8
merge in ics-mr1-release history after reset to ics-mr1
2011-11-03 06:44:39 -07:00
dab3b5fb0a
am 03389f69: am 14cee9a9: Merge "Updating QSB button padding to reflect change in asset." into ics-mr1
...
* commit '03389f69024cb992f2d225f7c97c5984fe4be20b':
Updating QSB button padding to reflect change in asset.
2011-11-03 00:52:15 +00:00
03389f6902
am 14cee9a9: Merge "Updating QSB button padding to reflect change in asset." into ics-mr1
...
* commit '14cee9a9bb10807362595f1d1e486716f997fc00':
Updating QSB button padding to reflect change in asset.
2011-11-03 00:50:12 +00:00
5d2de76986
am 14cee9a9: Merge "Updating QSB button padding to reflect change in asset." into ics-mr1
...
* commit '14cee9a9bb10807362595f1d1e486716f997fc00':
Updating QSB button padding to reflect change in asset.
2011-11-03 00:48:36 +00:00
1be99b0c76
am 96219dc2: am 98363247: (-s ours) am c703b368: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '96219dc279f268ef1bcbb7cdf5da8dbb5f5022df':
Import revised translations. DO NOT MERGE
2011-11-03 00:45:54 +00:00
14cee9a9bb
Merge "Updating QSB button padding to reflect change in asset." into ics-mr1
2011-11-02 17:45:28 -07:00
96219dc279
am 98363247: (-s ours) am c703b368: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '983632478d4b083251ff1cc1d6c987225aa357ec':
Import revised translations. DO NOT MERGE
2011-11-03 00:43:24 +00:00
cc83079714
am 98363247: am c703b368: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '983632478d4b083251ff1cc1d6c987225aa357ec':
Import revised translations. DO NOT MERGE
2011-11-03 00:10:10 +00:00
983632478d
am c703b368: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'c703b3683fb06b891b5d04262dc077b433cd1f8c':
Import revised translations. DO NOT MERGE
2011-11-03 00:04:24 +00:00
cfee0cc033
Tentative fix for monkey crash, issue 5556086
...
Change-Id: Iea6b39133b297dc809e64a20d22156f59950db74
2011-11-02 16:13:25 -07:00
8a1e8dad4d
am 882616a3: am 25b2995c: Tentative fix for monkey crash, issue 5556086
...
* commit '882616a3678e037dc6693642390bb389981a88fe':
Tentative fix for monkey crash, issue 5556086
2011-11-02 23:06:39 +00:00
882616a367
am 25b2995c: Tentative fix for monkey crash, issue 5556086
...
* commit '25b2995c6723c01fbabcea04636358501bc8d17a':
Tentative fix for monkey crash, issue 5556086
2011-11-02 23:04:55 +00:00
f4478a4002
am 25b2995c: Tentative fix for monkey crash, issue 5556086
...
* commit '25b2995c6723c01fbabcea04636358501bc8d17a':
Tentative fix for monkey crash, issue 5556086
2011-11-02 23:03:10 +00:00
25b2995c67
Tentative fix for monkey crash, issue 5556086
...
Change-Id: Iea6b39133b297dc809e64a20d22156f59950db74
2011-11-02 15:52:56 -07:00
c703b3683f
Import revised translations. DO NOT MERGE
...
Change-Id: Ie84fbcb91dfb3e4250fd69a892ae2dec729acde2
2011-11-02 15:17:59 -07:00
6166d23526
am cd8c964b: Merge "Import revised translations."
...
* commit 'cd8c964becbbd4b08c427b81b68ee33237a470fa':
Import revised translations.
2011-11-02 21:14:34 +00:00
cd8c964bec
Merge "Import revised translations."
2011-11-02 14:13:13 -07:00
4e67c37606
am e0c56d90: am 4a4f5c35: Merge "Adding padding on crespo for qsb bar by shrinking folder preview size." into ics-mr1
...
* commit 'e0c56d90880d57c4012e25b42144bf0071d2e95c':
Adding padding on crespo for qsb bar by shrinking folder preview size.
2011-11-02 17:58:52 +00:00
a306da4fb9
Updating QSB button padding to reflect change in asset.
...
Change-Id: I7ca3566d26dc9c21aef30ec911180511a2808236
2011-11-02 10:55:36 -07:00
4ac359a621
am 001b0126: (-s ours) am 7eb9220a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '001b0126dbb73ce0f15c3e6fd690fff39383466e':
Import revised translations. DO NOT MERGE
2011-11-02 17:52:48 +00:00
e0c56d9088
am 4a4f5c35: Merge "Adding padding on crespo for qsb bar by shrinking folder preview size." into ics-mr1
...
* commit '4a4f5c355740e0a4ff54b3279a6dd318b4a53aa6':
Adding padding on crespo for qsb bar by shrinking folder preview size.
2011-11-02 17:50:51 +00:00
1ce5ca8c7f
am e4410ec0: Merge "Potential fix for launcher lockup (5369863)" into ics-mr1
...
* commit 'e4410ec01379b938033f759f644bcbfcd58d4e25':
Potential fix for launcher lockup (5369863)
2011-11-02 17:31:27 +00:00
001b0126db
am 7eb9220a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '7eb9220a91450d42f714124fe8e2beeb632fc52d':
Import revised translations. DO NOT MERGE
2011-11-02 17:31:27 +00:00
5c6027b79a
am 55f57c49: Merge "Launcher performance optimizations: shaving about 3ms off Workspace.dispatchDraw()" into ics-mr1
...
* commit '55f57c49cf333a6015befe38131ef8a78a091171':
Launcher performance optimizations: shaving about 3ms off Workspace.dispatchDraw()
2011-11-02 17:30:41 +00:00
dd1939f951
am 32f491c9: Merge "Fixing issue where default widget previews were not using large icons on tablet." into ics-mr1
...
* commit '32f491c9dfc21ad92fef28fce45dcee6ba036593':
Fixing issue where default widget previews were not using large icons on tablet.
2011-11-02 17:30:27 +00:00
ac655e01aa
am 132793e6: Merge "Fix stuttering animation when you press home" into ics-mr1
...
* commit '132793e607313aa6f573d2241706fd12db6f1651':
Fix stuttering animation when you press home
2011-11-02 17:29:47 +00:00
0d59f0cedf
am cf489fe0: Merge "Update tablet wallpaper size" into ics-mr1
...
* commit 'cf489fe0c6ca71bee4991b9b853665cba4e80868':
Update tablet wallpaper size
2011-11-02 17:29:47 +00:00
601584aa01
Import revised translations.
...
Change-Id: I790ae933323c2d7a124e8ca56fc20e9386c8989d
2011-11-02 10:23:26 -07:00
Adam Cohen
Winson Chung
Eric Fischer
The Android Open Source Project
The Android Automerger
Michael Jurka