b3313f27d6
merge in ics-release history after reset to master
2011-06-20 06:44:50 -07:00
923aa62463
rectify build files.
...
Change-Id: I138ac7805cb045f960e32193bad95a73cd8b063e
2011-06-17 12:11:23 -07:00
b6c2a87511
Merge "Fixing small issue with widget divider showing in Phone UI and Shop text showing in other languages."
2011-06-16 18:46:37 -07:00
eb66b14000
Fixing small issue with widget divider showing in Phone UI and Shop text showing in other languages.
...
- Removing some unused assets
Change-Id: I40dec108b35ed4fcc769405446664e8180cb6d41
2011-06-16 18:07:35 -07:00
d8f7de94f9
Reconcile with honeycomb-mr2-release
...
Change-Id: Ie64c22de6fee25395210fed13ed0bf2f53fa004f
2011-06-16 10:32:56 -07:00
a49ca65170
am d38c2d85: (-s ours) am 06a73e26: am 0c314b37: Import revised translations. DO NOT MERGE
...
* commit 'd38c2d85c4ff4b9f19196e80e22d53aa01655a32':
Import revised translations. DO NOT MERGE
2011-06-16 09:32:27 -07:00
771d38657b
merge in ics-release history after reset to master
2011-06-16 08:46:09 -07:00
d1b18426d3
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-15 23:02:49 -07:00
d38c2d85c4
am 06a73e26: am 0c314b37: Import revised translations. DO NOT MERGE
...
* commit '06a73e26b473b554c1f2d31d8c78745a4d5987d0':
Import revised translations. DO NOT MERGE
2011-06-15 16:50:14 -07:00
06a73e26b4
am 0c314b37: Import revised translations. DO NOT MERGE
...
* commit '0c314b3712af054707f54d8ede6dfbed1522d0f4':
Import revised translations. DO NOT MERGE
2011-06-15 16:43:58 -07:00
0c314b3712
Import revised translations. DO NOT MERGE
...
Change-Id: Id7cfa127d4a075f6cd0627d5511c6b2545e148f6
2011-06-15 15:10:34 -07:00
e8bf8a2cb0
Reconcile with honeycomb-mr2-release
...
Change-Id: If4754920ba3d9c25730d0d939235ea779a510369
2011-06-15 15:10:01 -07:00
cf968c5cec
merge in ics-release history after reset to master
2011-06-15 06:44:18 -07:00
ec18d35d4f
Merge "Adding signposting to Phone UI in Workspace/AppsCustomize."
2011-06-14 16:03:32 -07:00
007c69867d
Adding signposting to Phone UI in Workspace/AppsCustomize.
...
Change-Id: Id63f247745a5ec1a63bbaff84602e4c91354f789
2011-06-14 16:02:56 -07:00
f2ff7d9f3e
Allow overlays to disable hw acceleration
2011-06-14 14:38:49 -07:00
92772245c5
merge in ics-release history after reset to master
2011-06-14 06:40:47 -07:00
1dfdf234cc
Merge "Fixing crash in FocusHelper and removing some old focus code for old Customize layout."
2011-06-13 20:01:55 -07:00
bf8bee70c2
Merge "Tightening up the widget resize frame to account for widget padding"
2011-06-13 19:05:41 -07:00
37b59ff9aa
Tightening up the widget resize frame to account for widget padding
...
-> 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
2011-06-13 19:03:22 -07:00
faa13255de
Fixing crash in FocusHelper and removing some old focus code for old Customize layout.
...
Change-Id: Ifd8a38174bbcf04c0ffeeefb4f42419e82a6ba95
2011-06-13 18:47:30 -07:00
bfbfd26c62
Initial implementation of folder reordering
...
Change-Id: I9f700e71f46e3b91afa96742d9e3890d519c391d
2011-06-13 16:55:12 -07:00
09713d6a1f
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-13 14:39:55 -07:00
61fa4197c4
Fixing drop target area, and adding bg color indicators.
...
- Merging wallpaper fix and PagedViewIconCache key fix
Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
2011-06-13 11:51:18 -07:00
f0ea4d3378
Replacing AllApps/Customize in tablet UI with Apps/Customize.
...
Change-Id: I11a296b25472e4bf298a468865b0dff29f500aaa
2011-06-13 11:49:32 -07:00
0f1378d53f
merge in ics-release history after reset to master
2011-06-13 06:44:22 -07:00
bf5a5c894d
Reconcile with honeycomb-mr2-release
...
Change-Id: I378ee5b52951c71a761c9e2e8234dcb0c0d4fced
2011-06-10 15:42:54 -07:00
86a8693011
am 8625c795: (-s ours) am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2
...
* commit '8625c7957ccb71e11c79137ff58be6fe066da0bd':
DO NOT MERGE Fix rotation and memory use bugs
2011-06-10 15:21:13 -07:00
eda7f59f24
Merge "Fixing up some folder-related drag and drop bugs"
2011-06-10 13:37:12 -07:00
93fb953119
am d26fd29b: am 153a757a: am fdb4e69f: Mark access to private styles now that aapt enforces this.
...
* commit 'd26fd29b66d76da215b5fe2ae54adbb8ec903082':
Mark access to private styles now that aapt enforces this.
2011-06-10 12:51:32 -07:00
8625c7957c
am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2
...
* commit '385d051933da07e3c7f81aac263e9f4f23d716f6':
DO NOT MERGE Fix rotation and memory use bugs
2011-06-10 10:39:42 -07:00
385d051933
am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2
...
* commit 'b16a6d6e1d451abb68ae9e127ae8d5e77627f2f3':
DO NOT MERGE Fix rotation and memory use bugs
2011-06-10 10:15:27 -07:00
b16a6d6e1d
Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2
2011-06-10 10:12:00 -07:00
91e2dd39a7
Merge "Removing search widget."
2011-06-10 09:58:04 -07:00
94aad81488
Removing search widget.
...
Change-Id: I5a83d5a8f7eda6ddf7cf8b15ea4523673b584c04
2011-06-10 09:56:05 -07:00
cba86d8696
merge in ics-release history after reset to master
2011-06-10 06:43:34 -07:00
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
cc258c5dc5
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-09 17:43:28 -07:00
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
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
fdb4e69fad
Mark access to private styles now that aapt enforces this.
...
Change-Id: I76a05f38f2b7598362e7dda2f5bf751c05447928
2011-06-09 15:33:18 -07:00
76078c4ef3
Fixing up some folder-related drag and drop bugs
...
Change-Id: I712ffd0ccfc0154a5a9e74e3f585157a86986882
2011-06-09 15:10:43 -07:00
ad8fe0c12b
Reconcile with honeycomb-mr2-release
...
Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88
2011-06-09 15:01:26 -07:00
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
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
f5ed39cd40
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
2011-06-09 07:11:23 -07:00
72b4878e05
merge in ics-release history after reset to master
2011-06-09 06:44:32 -07:00
3732cf8b49
Merge "Modifying AppsCustomize behaviour to use springloaded mode."
2011-06-08 17:39:07 -07:00
9e612fb8c4
Merge "Removing old Launcher callback reference from LauncherModel when the activity is destroyed."
2011-06-08 17:38:55 -07:00
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
The Android Automerger
Tsu Chiang Chuang
Winson Chung
The Android Open Source Project
Eric Fischer
Michael Jurka
Adam Cohen
Dianne Hackborn
Jean-Baptiste Queru