summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reconcile with honeycomb-mr2-releaseThe Android Open Source Project2011-06-150-0/+0
|\ | | | | | | Change-Id: If4754920ba3d9c25730d0d939235ea779a510369
| * merge in honeycomb-mr2-release history after reset to honeycomb-mr2The Android Automerger2011-06-130-0/+0
| |\
* | \ Merge "Adding signposting to Phone UI in Workspace/AppsCustomize."Winson Chung2011-06-148-12/+145
|\ \ \
| * | | Adding signposting to Phone UI in Workspace/AppsCustomize.Winson Chung2011-06-148-12/+145
| | | | | | | | | | | | | | | | Change-Id: Id63f247745a5ec1a63bbaff84602e4c91354f789
* | | | Allow overlays to disable hw accelerationMichael Jurka2011-06-142-1/+2
|/ / /
* | | Merge "Fixing crash in FocusHelper and removing some old focus code for old ↵Winson Chung2011-06-134-144/+24
|\ \ \ | | | | | | | | | | | | Customize layout."
| * | | Fixing crash in FocusHelper and removing some old focus code for old ↵Winson Chung2011-06-134-144/+24
| | | | | | | | | | | | | | | | | | | | | | | | Customize layout. Change-Id: Ifd8a38174bbcf04c0ffeeefb4f42419e82a6ba95
* | | | Merge "Tightening up the widget resize frame to account for widget padding"Adam Cohen2011-06-131-4/+19
|\ \ \ \
| * | | | Tightening up the widget resize frame to account for widget paddingAdam Cohen2011-06-131-4/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | -> This wasn't possible before as we weren't enforcing the padding, but now that we are we can make the resizing look better Change-Id: I7b74eee052beaee0cc12f4cec0505af9c214d012
* / / / Initial implementation of folder reorderingAdam Cohen2011-06-138-146/+242
|/ / / | | | | | | | | | Change-Id: I9f700e71f46e3b91afa96742d9e3890d519c391d
* | | Fixing drop target area, and adding bg color indicators.Winson Chung2011-06-1312-78/+176
| | | | | | | | | | | | | | | | | | - Merging wallpaper fix and PagedViewIconCache key fix Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
* | | Replacing AllApps/Customize in tablet UI with Apps/Customize.Winson Chung2011-06-1336-1004/+723
| | | | | | | | | | | | Change-Id: I11a296b25472e4bf298a468865b0dff29f500aaa
* | | Reconcile with honeycomb-mr2-releaseThe Android Open Source Project2011-06-100-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: I378ee5b52951c71a761c9e2e8234dcb0c0d4fced
| * | merge in honeycomb-mr2-release history after reset to honeycomb-mr2The Android Automerger2011-06-090-0/+0
| |\ \
* | \ \ am 8625c795: (-s ours) am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix ↵Michael Jurka2011-06-100-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation and memory use bugs" into honeycomb-mr2 * commit '8625c7957ccb71e11c79137ff58be6fe066da0bd': DO NOT MERGE Fix rotation and memory use bugs
| * \ \ \ am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use ↵Michael Jurka2011-06-106-60/+165
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugs" into honeycomb-mr2 * commit '385d051933da07e3c7f81aac263e9f4f23d716f6': DO NOT MERGE Fix rotation and memory use bugs
| | * \ \ \ am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into ↵Michael Jurka2011-06-106-60/+165
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'b16a6d6e1d451abb68ae9e127ae8d5e77627f2f3': DO NOT MERGE Fix rotation and memory use bugs
| | | * | | Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2Michael Jurka2011-06-106-60/+165
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | DO NOT MERGE Fix rotation and memory use bugsMichael Jurka2011-06-096-60/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | Merge "Fixing up some folder-related drag and drop bugs"Adam Cohen2011-06-104-47/+96
|\ \ \ \ \ \
| * | | | | | Fixing up some folder-related drag and drop bugsAdam Cohen2011-06-094-47/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I712ffd0ccfc0154a5a9e74e3f585157a86986882
* | | | | | | am d26fd29b: am 153a757a: am fdb4e69f: Mark access to private styles now ↵Dianne Hackborn2011-06-101-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that aapt enforces this. * commit 'd26fd29b66d76da215b5fe2ae54adbb8ec903082': Mark access to private styles now that aapt enforces this.
| * | | | | | am 153a757a: am fdb4e69f: Mark access to private styles now that aapt ↵Dianne Hackborn2011-06-091-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enforces this. * commit '153a757a686b8912d149b0425d67676385f02301': Mark access to private styles now that aapt enforces this.
| | * | | | | am fdb4e69f: Mark access to private styles now that aapt enforces this.Dianne Hackborn2011-06-091-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit 'fdb4e69fad1c2566553cda66787b54c1de51924f': Mark access to private styles now that aapt enforces this.
| | | * | | | Mark access to private styles now that aapt enforces this.Dianne Hackborn2011-06-091-1/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | Change-Id: I76a05f38f2b7598362e7dda2f5bf751c05447928
* | | | | | Merge "Removing search widget."Winson Chung2011-06-101-4/+0
|\ \ \ \ \ \
| * | | | | | Removing search widget.Winson Chung2011-06-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a83d5a8f7eda6ddf7cf8b15ea4523673b584c04
* | | | | | | Reconcile with honeycomb-mr2-releaseJean-Baptiste Queru2011-06-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88
| * | | | | | merge in honeycomb-mr2-release history after reset to honeycomb-mr2The Android Automerger2011-06-090-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | am 64a3cbf8: (-s ours) am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp ↵Michael Jurka2011-06-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for NPE" into honeycomb-mr2 * commit '64a3cbf864785d3817e1f698505790426fc5b0b7': DO NOT MERGE temp fix for NPE
| * | | | | | am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into ↵Michael Jurka2011-06-081-0/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'f44abc8e1bb0a958c0f8a04329f99d82683031e1': DO NOT MERGE temp fix for NPE
| | * | | | | am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2Michael Jurka2011-06-081-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76': DO NOT MERGE temp fix for NPE
| | | * | | | Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2Michael Jurka2011-06-081-0/+4
| | | |\ \ \ \
| | | | * | | | DO NOT MERGE temp fix for NPEMichael Jurka2011-06-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3508479 Change-Id: I25c8aec546e2fe13c954fe362a4231e05039e607
* | | | | | | | am 83c70cf8: am d9455775: am 20b7ca91: Fix bug with snapping during scrollingMichael Jurka2011-06-091-3/+3
|\| | | | | | | | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * commit '83c70cf8ee6ff5912394ce9b3efc0bdea9401ae2': Fix bug with snapping during scrolling
| * | | | | | am d9455775: am 20b7ca91: Fix bug with snapping during scrollingMichael Jurka2011-06-081-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd94557758e735cc59cfc89513585e732905bbfcd': Fix bug with snapping during scrolling
| | * | | | | am 20b7ca91: Fix bug with snapping during scrollingMichael Jurka2011-06-081-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20b7ca91b277e9668b6d4b4b3c9116b6778d22a5': Fix bug with snapping during scrolling
| | | * | | | Fix bug with snapping during scrollingMichael Jurka2011-06-081-3/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug # 4490518 Change-Id: I1bf1954bc319d18aef45eebfd48b46f4ff0a9038
* | | | | | Merge "Modifying AppsCustomize behaviour to use springloaded mode."Winson Chung2011-06-0835-176/+187
|\ \ \ \ \ \
| * | | | | | Modifying AppsCustomize behaviour to use springloaded mode.Winson Chung2011-06-0835-176/+187
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I21d181ad3d245731ee8402915f8918b91bfc4553
* | | | | | Merge "Removing old Launcher callback reference from LauncherModel when the ↵Winson Chung2011-06-082-5/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | activity is destroyed."
| * | | | | Removing old Launcher callback reference from LauncherModel when the ↵Winson Chung2011-06-082-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity is destroyed. Change-Id: I288d2bd7e305c2cf9bdeec5357997d566d5205b7
* | | | | | Fixing up some Folder bugsAdam Cohen2011-06-0814-210/+310
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> 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
* | | | | Reconcile with honeycomb-mr2-releaseJean-Baptiste Queru2011-06-070-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: Iec7f78f0f58c018ee36e67d6e8d89ca02d6a9383
| * | | | merge in honeycomb-mr2-release history after reset to honeycomb-mr2The Android Automerger2011-06-060-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | merge in honeycomb-mr2-release history after reset to honeycomb-mr2The Android Automerger2011-06-020-0/+0
| | |\ \ \
| | | * \ \ merge in honeycomb-mr2-release history after reset to honeycomb-mr2The Android Automerger2011-06-010-0/+0
| | | |\ \ \
| | | | * | | Fix issue with missing row/column on workspaceMichael Jurka2011-05-312-56/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b750f66ef1fd5c9b5501763fa1e371b104d03ea
* | | | | | | Merge "Add missing assets for RocketLauncher on phones."Daniel Sandler2011-06-072-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Add missing assets for RocketLauncher on phones.Daniel Sandler2011-06-042-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4541201 Change-Id: I2644dfe5e5a36a91e70ecf49300c82bf1eef2269