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
007334498a
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:20:37 +00:00
4a4f5c3557
Merge "Adding padding on crespo for qsb bar by shrinking folder preview size." into ics-mr1
2011-11-02 10:18:55 -07:00
19b3dc5849
merge in ics-mr1-release history after reset to ics-mr1
2011-11-02 06:46:39 -07:00
18aacc3dd3
Adding padding on crespo for qsb bar by shrinking folder preview size.
...
Change-Id: I9222ec6b66eb3146d4998013b82fdce664b01314
2011-11-01 17:26:00 -07:00
67dcb654f4
am 7eb9220a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '7eb9220a91450d42f714124fe8e2beeb632fc52d':
Import revised translations. DO NOT MERGE
2011-11-01 20:53:31 +00:00
d67227be87
am e4410ec0: Merge "Potential fix for launcher lockup (5369863)" into ics-mr1
...
* commit 'e4410ec01379b938033f759f644bcbfcd58d4e25':
Potential fix for launcher lockup (5369863)
2011-11-01 20:53:30 +00:00
7eb9220a91
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-01 13:51:43 -07:00
e4410ec013
Merge "Potential fix for launcher lockup (5369863)" into ics-mr1
2011-11-01 13:51:39 -07:00
aae1f99b9e
Import revised translations. DO NOT MERGE
...
Change-Id: I0ea74913b09a2a0f22b96b72f76beb94b15d7a43
2011-11-01 13:36:49 -07:00
6fe99005c5
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-01 19:46:53 +00:00
55f57c49cf
Merge "Launcher performance optimizations: shaving about 3ms off Workspace.dispatchDraw()" into ics-mr1
2011-11-01 12:45:07 -07:00
76ebb73d54
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-01 17:46:06 +00:00
32f491c9df
Merge "Fixing issue where default widget previews were not using large icons on tablet." into ics-mr1
2011-11-01 10:43:54 -07:00
d58b4dbd45
merge in ics-release history after reset to master
2011-11-01 07:00:48 -07:00
7260ed1549
merge in ics-mr1-release history after reset to ics-mr1
2011-11-01 06:46:23 -07:00
7246e60472
am 132793e6: Merge "Fix stuttering animation when you press home" into ics-mr1
...
* commit '132793e607313aa6f573d2241706fd12db6f1651':
Fix stuttering animation when you press home
2011-11-01 05:54:54 +00:00
56d8c32842
am cf489fe0: Merge "Update tablet wallpaper size" into ics-mr1
...
* commit 'cf489fe0c6ca71bee4991b9b853665cba4e80868':
Update tablet wallpaper size
2011-11-01 05:54:53 +00:00
132793e607
Merge "Fix stuttering animation when you press home" into ics-mr1
2011-10-31 22:53:39 -07:00
The Android Open Source Project
Winson Chung
Adam Cohen
The Android Automerger
Eric Fischer
Michael Jurka