Michael Jurka
b16a6d6e1d
Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2
2011-06-10 10:12:00 -07:00
Winson Chung
91e2dd39a7
Merge "Removing search widget."
2011-06-10 09:58:04 -07:00
Winson Chung
94aad81488
Removing search widget.
...
Change-Id: I5a83d5a8f7eda6ddf7cf8b15ea4523673b584c04
2011-06-10 09:56:05 -07:00
The Android Automerger
cba86d8696
merge in ics-release history after reset to master
2011-06-10 06:43:34 -07:00
Michael Jurka
ccf379b9fa
DO NOT MERGE Fix rotation and memory use bugs
...
- Reducing memory used by widget previews
- Reducing time to rotate between port and land
- Fixing wallpaper jump during rotation
Bug # 4575736
Bug # 4559451
Change-Id: I1551ac3a7b8b0b125dac12fbedfb3832549bd22f
2011-06-09 21:26:35 -07:00
The Android Automerger
cc258c5dc5
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-09 17:43:28 -07:00
Dianne Hackborn
d26fd29b66
am 153a757a: am fdb4e69f: Mark access to private styles now that aapt enforces this.
...
* commit '153a757a686b8912d149b0425d67676385f02301':
Mark access to private styles now that aapt enforces this.
2011-06-09 16:09:04 -07:00
Dianne Hackborn
153a757a68
am fdb4e69f: Mark access to private styles now that aapt enforces this.
...
* commit 'fdb4e69fad1c2566553cda66787b54c1de51924f':
Mark access to private styles now that aapt enforces this.
2011-06-09 16:04:51 -07:00
Dianne Hackborn
fdb4e69fad
Mark access to private styles now that aapt enforces this.
...
Change-Id: I76a05f38f2b7598362e7dda2f5bf751c05447928
2011-06-09 15:33:18 -07:00
Adam Cohen
76078c4ef3
Fixing up some folder-related drag and drop bugs
...
Change-Id: I712ffd0ccfc0154a5a9e74e3f585157a86986882
2011-06-09 15:10:43 -07:00
Jean-Baptiste Queru
ad8fe0c12b
Reconcile with honeycomb-mr2-release
...
Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88
2011-06-09 15:01:26 -07:00
Michael Jurka
88c73a6216
am 64a3cbf8: (-s ours) am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
...
* commit '64a3cbf864785d3817e1f698505790426fc5b0b7':
DO NOT MERGE temp fix for NPE
2011-06-09 13:32:30 -07:00
Michael Jurka
fbd14ac287
am 83c70cf8: am d9455775: am 20b7ca91: Fix bug with snapping during scrolling
...
* commit '83c70cf8ee6ff5912394ce9b3efc0bdea9401ae2':
Fix bug with snapping during scrolling
2011-06-09 13:32:21 -07:00
The Android Automerger
f5ed39cd40
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-09 07:11:23 -07:00
The Android Automerger
72b4878e05
merge in ics-release history after reset to master
2011-06-09 06:44:32 -07:00
Winson Chung
3732cf8b49
Merge "Modifying AppsCustomize behaviour to use springloaded mode."
2011-06-08 17:39:07 -07:00
Winson Chung
9e612fb8c4
Merge "Removing old Launcher callback reference from LauncherModel when the activity is destroyed."
2011-06-08 17:38:55 -07:00
Michael Jurka
64a3cbf864
am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
...
* commit 'f44abc8e1bb0a958c0f8a04329f99d82683031e1':
DO NOT MERGE temp fix for NPE
2011-06-08 17:15:40 -07:00
Michael Jurka
83c70cf8ee
am d9455775: am 20b7ca91: Fix bug with snapping during scrolling
...
* commit 'd94557758e735cc59cfc89513585e732905bbfcd':
Fix bug with snapping during scrolling
2011-06-08 17:15:37 -07:00
Michael Jurka
f44abc8e1b
am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
...
* commit '6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76':
DO NOT MERGE temp fix for NPE
2011-06-08 16:53:56 -07:00
Michael Jurka
d94557758e
am 20b7ca91: Fix bug with snapping during scrolling
...
* commit '20b7ca91b277e9668b6d4b4b3c9116b6778d22a5':
Fix bug with snapping during scrolling
2011-06-08 16:53:45 -07:00
Michael Jurka
6b32fc9bd0
Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
2011-06-08 16:51:11 -07:00
Winson Chung
b26f3d6a8c
Modifying AppsCustomize behaviour to use springloaded mode.
...
Change-Id: I21d181ad3d245731ee8402915f8918b91bfc4553
2011-06-08 16:42:03 -07:00
Michael Jurka
7affb23aa8
DO NOT MERGE temp fix for NPE
...
Bug #3508479
Change-Id: I25c8aec546e2fe13c954fe362a4231e05039e607
2011-06-08 16:40:35 -07:00
Winson Chung
cd2b01416f
Removing old Launcher callback reference from LauncherModel when the activity is destroyed.
...
Change-Id: I288d2bd7e305c2cf9bdeec5357997d566d5205b7
2011-06-08 16:19:08 -07:00
Adam Cohen
c0dcf59708
Fixing up some Folder bugs
...
-> Rendering properly while in spring-loaded mode
-> Fixed bug where sometimes the folder's background would vanish
-> Fixed bug where the folder background was "stuck" in a fixed
location, not following the folder
-> Can now add to folders and create folders from spring-loaded mode
Change-Id: Ie1c5583a6230a192e6d07763d001b50053daca43
2011-06-08 15:21:29 -07:00
Michael Jurka
20b7ca91b2
Fix bug with snapping during scrolling
...
Bug # 4490518
Change-Id: I1bf1954bc319d18aef45eebfd48b46f4ff0a9038
2011-06-08 14:42:48 -07:00
The Android Automerger
f827c50930
merge in ics-release history after reset to master
2011-06-08 06:44:07 -07:00
The Android Automerger
e4248ab240
merge in ics-release history after reset to master
2011-06-07 11:10:12 -07:00
Jean-Baptiste Queru
9578bde6a9
Reconcile with honeycomb-mr2-release
...
Change-Id: Iec7f78f0f58c018ee36e67d6e8d89ca02d6a9383
2011-06-07 10:42:37 -07:00
Daniel Sandler
6b1325a0c7
Merge "Add missing assets for RocketLauncher on phones."
2011-06-07 08:25:11 -07:00
The Android Automerger
0c33aa01d0
merge in ics-release history after reset to master
2011-06-07 06:44:29 -07:00
Eric Fischer
b9af5f7c42
Import revised translations.
...
Change-Id: I755d7cc711f1de835584e2317e843a19470ef060
2011-06-06 16:07:03 -07:00
The Android Automerger
394fc5fd0c
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-06 07:10:51 -07:00
The Android Automerger
447701397f
merge in ics-release history after reset to master
2011-06-06 06:43:29 -07:00
Daniel Sandler
48cb7fb67b
Add missing assets for RocketLauncher on phones.
...
Bug: 4541201
Change-Id: I2644dfe5e5a36a91e70ecf49300c82bf1eef2269
2011-06-04 00:28:50 -04:00
Michael Jurka
759918f851
Merge "fix the build"
2011-06-03 18:43:21 -07:00
Michael Jurka
88b62cfb3b
Merge "Fix issue with missing row/column on workspace"
2011-06-03 18:43:17 -07:00
Michael Jurka
8e41ad2316
fix the build
2011-06-03 18:42:05 -07:00
Michael Jurka
71cf806d3d
Merge "Fixing bug with layout of PagedViewCellLayoutChildren"
2011-06-03 17:58:50 -07:00
Michael Jurka
9bfe2b2646
Fixing bug with layout of PagedViewCellLayoutChildren
...
Change-Id: I3fa34ad500632c4b257973aca9be0cb1bda5884a
2011-06-03 17:56:20 -07:00
Michael Jurka
716730ba81
am 5e9d734d: am 330ed29d: am f8e0c76e: Making customize mode tabs more compact
...
* commit '5e9d734d59fb28c8a8c3ca3676d12796e19629a2':
Making customize mode tabs more compact
2011-06-03 17:56:08 -07:00
Michael Jurka
bf6cb22007
am 1e21c180: am 87e560bc: am a9c683d9: Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2
...
* commit '1e21c180caeab819eeb55da7093fc12a90e5f67a':
Fixing calculation of # of rows in All Apps
2011-06-03 17:56:01 -07:00
Michael Jurka
50f3ad1443
am 1ed01c88: (-s ours) am c9fa2b76: am 2478480a: Fixing bug with layout of PagedViewCellLayoutChildren
...
* commit '1ed01c884bdce3051a8c5dfc2c7a48613f5f3e75':
Fixing bug with layout of PagedViewCellLayoutChildren
2011-06-03 17:55:58 -07:00
The Android Automerger
64f8998bd7
merge in ics-release history after reset to master
2011-06-03 14:56:51 -07:00
Michael Jurka
4a78ec342d
am b82cc0cc: am 1fd2c158: am 32271c3d: Tweak calculation for number of columns and rows
...
* commit 'b82cc0cc9b61eef0670dc7fddc53813455ca2f4d':
Tweak calculation for number of columns and rows
2011-06-03 14:43:36 -07:00
Michael Jurka
f61249b799
Fix issue with missing row/column on workspace
...
Change-Id: I7b750f66ef1fd5c9b5501763fa1e371b104d03ea
2011-06-03 14:27:52 -07:00
Michael Jurka
5e9d734d59
am 330ed29d: am f8e0c76e: Making customize mode tabs more compact
...
* commit '330ed29d41a263ed8455f734b1688e04e7cb1c98':
Making customize mode tabs more compact
2011-06-03 14:26:53 -07:00
Michael Jurka
330ed29d41
am f8e0c76e: Making customize mode tabs more compact
...
* commit 'f8e0c76e0326440e6371e8eaf88c446e565ee732':
Making customize mode tabs more compact
2011-06-03 14:22:52 -07:00
Michael Jurka
1e21c180ca
am 87e560bc: am a9c683d9: Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2
...
* commit '87e560bc798221fc857d4380be90dc6b78021fd2':
Fixing calculation of # of rows in All Apps
2011-06-03 14:22:51 -07:00