8aaf09c613
am b37d23b0: am 929fff0e: Potential fix for launcher lockup (5369863)
...
* commit 'b37d23b02867811cf15299645d73ba3b2856d59a':
Potential fix for launcher lockup (5369863)
2011-11-09 21:18:58 +00:00
b37d23b028
am 929fff0e: Potential fix for launcher lockup (5369863)
...
* commit '929fff0e747f1361db19e62f8a1e462cffc0a7b6':
Potential fix for launcher lockup (5369863)
2011-11-09 14:35:13 +00:00
929fff0e74
Potential fix for launcher lockup (5369863)
...
- also, removing unused parameters and doing some function renames
2011-11-07 16:27:05 -08:00
4d5f1233f0
am 2632ca01: Merge "Ensuring disabled apps don\'t appear in workspace (issue: 5557311)" into ics-mr1
...
* commit '2632ca01e1127a33845f832b60be3df24d73b0f4':
Ensuring disabled apps don't appear in workspace (issue: 5557311)
2011-11-07 22:20:31 +00:00
6b3909fd72
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:17:46 +00:00
2632ca01e1
Merge "Ensuring disabled apps don't appear in workspace (issue: 5557311)" into ics-mr1
2011-11-07 14:17:13 -08:00
a0654a3523
Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1
2011-11-07 14:14:55 -08: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
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
5974932dae
Reconcile with ics-mr1-release
...
Change-Id: I89b1421563c2b3e43421e1a8c04b484b450f5327
2011-11-07 08:31:56 -08:00
f7388a7a00
merge in ics-mr1-release history after reset to ics-mr1
2011-11-06 06:46:39 -08: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
acec671920
Merge "Cleaning up overscroll effect in launcher workspace" into ics-mr1
2011-11-04 13:59:53 -07: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
2107d12aa8
merge in ics-mr1-release history after reset to ics-mr1
2011-11-03 06:44:39 -07: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
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
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
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
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
cd8c964bec
Merge "Import revised translations."
2011-11-02 14:13:13 -07:00
a306da4fb9
Updating QSB button padding to reflect change in asset.
...
Change-Id: I7ca3566d26dc9c21aef30ec911180511a2808236
2011-11-02 10:55:36 -07: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
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
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
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
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
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
55f57c49cf
Merge "Launcher performance optimizations: shaving about 3ms off Workspace.dispatchDraw()" into ics-mr1
2011-11-01 12:45:07 -07: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
7260ed1549
merge in ics-mr1-release history after reset to ics-mr1
2011-11-01 06:46:23 -07:00
132793e607
Merge "Fix stuttering animation when you press home" into ics-mr1
2011-10-31 22:53:39 -07:00
cf489fe0c6
Merge "Update tablet wallpaper size" into ics-mr1
2011-10-31 22:53:34 -07:00
b3e22d99c1
Potential fix for launcher lockup (5369863)
...
- also, removing unused parameters and doing some function renames
2011-10-31 16:33:43 -07:00
c36c68e838
am 0ee2a438: Merge "Fixing issue where widget previews were being scaled up." into ics-mr1
...
* commit '0ee2a438193205466aff63dd690ba6ca9796ddae':
Fixing issue where widget previews were being scaled up.
2011-10-31 22:13:22 +00:00
Michael Jurka
Adam Cohen
Winson Chung
Eric Fischer
The Android Open Source Project
The Android Automerger