OSDN Git Service
The Android Open Source Project [Wed, 15 Jun 2011 22:10:01 +0000 (15:10 -0700)]
Reconcile with honeycomb-mr2-release
Change-Id: If4754920ba3d9c25730d0d939235ea779a510369
Winson Chung [Tue, 14 Jun 2011 23:03:32 +0000 (16:03 -0700)]
Merge "Adding signposting to Phone UI in Workspace/AppsCustomize."
Winson Chung [Tue, 14 Jun 2011 20:27:53 +0000 (13:27 -0700)]
Adding signposting to Phone UI in Workspace/AppsCustomize.
Change-Id: Id63f247745a5ec1a63bbaff84602e4c91354f789
Michael Jurka [Tue, 14 Jun 2011 21:38:49 +0000 (14:38 -0700)]
Allow overlays to disable hw acceleration
Winson Chung [Tue, 14 Jun 2011 03:01:55 +0000 (20:01 -0700)]
Merge "Fixing crash in FocusHelper and removing some old focus code for old Customize layout."
Adam Cohen [Tue, 14 Jun 2011 02:05:41 +0000 (19:05 -0700)]
Merge "Tightening up the widget resize frame to account for widget padding"
Adam Cohen [Tue, 14 Jun 2011 00:13:42 +0000 (17:13 -0700)]
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
Winson Chung [Tue, 14 Jun 2011 01:15:54 +0000 (18:15 -0700)]
Fixing crash in FocusHelper and removing some old focus code for old Customize layout.
Change-Id: Ifd8a38174bbcf04c0ffeeefb4f42419e82a6ba95
Adam Cohen [Mon, 13 Jun 2011 23:55:12 +0000 (16:55 -0700)]
Initial implementation of folder reordering
Change-Id: I9f700e71f46e3b91afa96742d9e3890d519c391d
The Android Automerger [Mon, 13 Jun 2011 21:39:55 +0000 (14:39 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Winson Chung [Sun, 12 Jun 2011 22:15:29 +0000 (15:15 -0700)]
Fixing drop target area, and adding bg color indicators.
- Merging wallpaper fix and PagedViewIconCache key fix
Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
Winson Chung [Mon, 6 Jun 2011 21:27:16 +0000 (14:27 -0700)]
Replacing AllApps/Customize in tablet UI with Apps/Customize.
Change-Id: I11a296b25472e4bf298a468865b0dff29f500aaa
The Android Open Source Project [Fri, 10 Jun 2011 22:42:54 +0000 (15:42 -0700)]
Reconcile with honeycomb-mr2-release
Change-Id: I378ee5b52951c71a761c9e2e8234dcb0c0d4fced
Michael Jurka [Fri, 10 Jun 2011 22:21:13 +0000 (15:21 -0700)]
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
Adam Cohen [Fri, 10 Jun 2011 20:37:12 +0000 (13:37 -0700)]
Merge "Fixing up some folder-related drag and drop bugs"
Dianne Hackborn [Fri, 10 Jun 2011 19:51:32 +0000 (12:51 -0700)]
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.
Michael Jurka [Fri, 10 Jun 2011 17:39:42 +0000 (10:39 -0700)]
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
Michael Jurka [Fri, 10 Jun 2011 17:15:27 +0000 (10:15 -0700)]
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
Michael Jurka [Fri, 10 Jun 2011 17:12:00 +0000 (10:12 -0700)]
Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2
Winson Chung [Fri, 10 Jun 2011 16:58:04 +0000 (09:58 -0700)]
Merge "Removing search widget."
Winson Chung [Fri, 10 Jun 2011 16:56:05 +0000 (09:56 -0700)]
Removing search widget.
Change-Id: I5a83d5a8f7eda6ddf7cf8b15ea4523673b584c04
Michael Jurka [Thu, 9 Jun 2011 05:03:27 +0000 (22:03 -0700)]
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
The Android Automerger [Fri, 10 Jun 2011 00:43:28 +0000 (17:43 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 23:09:04 +0000 (16:09 -0700)]
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.
Dianne Hackborn [Thu, 9 Jun 2011 23:04:51 +0000 (16:04 -0700)]
am
fdb4e69f: Mark access to private styles now that aapt enforces this.
* commit '
fdb4e69fad1c2566553cda66787b54c1de51924f':
Mark access to private styles now that aapt enforces this.
Dianne Hackborn [Thu, 9 Jun 2011 22:33:18 +0000 (15:33 -0700)]
Mark access to private styles now that aapt enforces this.
Change-Id: I76a05f38f2b7598362e7dda2f5bf751c05447928
Adam Cohen [Thu, 9 Jun 2011 22:06:52 +0000 (15:06 -0700)]
Fixing up some folder-related drag and drop bugs
Change-Id: I712ffd0ccfc0154a5a9e74e3f585157a86986882
Jean-Baptiste Queru [Thu, 9 Jun 2011 22:01:26 +0000 (15:01 -0700)]
Reconcile with honeycomb-mr2-release
Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88
Michael Jurka [Thu, 9 Jun 2011 20:32:30 +0000 (13:32 -0700)]
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
Michael Jurka [Thu, 9 Jun 2011 20:32:21 +0000 (13:32 -0700)]
am
83c70cf8: am
d9455775: am
20b7ca91: Fix bug with snapping during scrolling
* commit '
83c70cf8ee6ff5912394ce9b3efc0bdea9401ae2':
Fix bug with snapping during scrolling
The Android Automerger [Thu, 9 Jun 2011 14:11:23 +0000 (07:11 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Winson Chung [Thu, 9 Jun 2011 00:39:07 +0000 (17:39 -0700)]
Merge "Modifying AppsCustomize behaviour to use springloaded mode."
Winson Chung [Thu, 9 Jun 2011 00:38:55 +0000 (17:38 -0700)]
Merge "Removing old Launcher callback reference from LauncherModel when the activity is destroyed."
Michael Jurka [Thu, 9 Jun 2011 00:15:40 +0000 (17:15 -0700)]
am
f44abc8e: am
6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
* commit '
f44abc8e1bb0a958c0f8a04329f99d82683031e1':
DO NOT MERGE temp fix for NPE
Michael Jurka [Thu, 9 Jun 2011 00:15:37 +0000 (17:15 -0700)]
am
d9455775: am
20b7ca91: Fix bug with snapping during scrolling
* commit '
d94557758e735cc59cfc89513585e732905bbfcd':
Fix bug with snapping during scrolling
Michael Jurka [Wed, 8 Jun 2011 23:53:56 +0000 (16:53 -0700)]
am
6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
* commit '
6b32fc9bd096a2cff3ae0f89ef8491e7b2e11f76':
DO NOT MERGE temp fix for NPE
Michael Jurka [Wed, 8 Jun 2011 23:53:45 +0000 (16:53 -0700)]
am
20b7ca91: Fix bug with snapping during scrolling
* commit '
20b7ca91b277e9668b6d4b4b3c9116b6778d22a5':
Fix bug with snapping during scrolling
Michael Jurka [Wed, 8 Jun 2011 23:51:11 +0000 (16:51 -0700)]
Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2
Winson Chung [Thu, 2 Jun 2011 17:49:29 +0000 (10:49 -0700)]
Modifying AppsCustomize behaviour to use springloaded mode.
Change-Id: I21d181ad3d245731ee8402915f8918b91bfc4553
Michael Jurka [Wed, 8 Jun 2011 22:50:14 +0000 (15:50 -0700)]
DO NOT MERGE temp fix for NPE
Bug #
3508479
Change-Id: I25c8aec546e2fe13c954fe362a4231e05039e607
Winson Chung [Wed, 8 Jun 2011 23:02:26 +0000 (16:02 -0700)]
Removing old Launcher callback reference from LauncherModel when the activity is destroyed.
Change-Id: I288d2bd7e305c2cf9bdeec5357997d566d5205b7
Adam Cohen [Wed, 1 Jun 2011 22:30:43 +0000 (15:30 -0700)]
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
Michael Jurka [Wed, 8 Jun 2011 03:09:16 +0000 (20:09 -0700)]
Fix bug with snapping during scrolling
Bug #
4490518
Change-Id: I1bf1954bc319d18aef45eebfd48b46f4ff0a9038
Jean-Baptiste Queru [Tue, 7 Jun 2011 17:42:37 +0000 (10:42 -0700)]
Reconcile with honeycomb-mr2-release
Change-Id: Iec7f78f0f58c018ee36e67d6e8d89ca02d6a9383
Daniel Sandler [Tue, 7 Jun 2011 15:25:11 +0000 (08:25 -0700)]
Merge "Add missing assets for RocketLauncher on phones."
Eric Fischer [Mon, 6 Jun 2011 23:07:03 +0000 (16:07 -0700)]
Import revised translations.
Change-Id: I755d7cc711f1de835584e2317e843a19470ef060
The Android Automerger [Mon, 6 Jun 2011 14:10:51 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Daniel Sandler [Sat, 4 Jun 2011 04:28:50 +0000 (00:28 -0400)]
Add missing assets for RocketLauncher on phones.
Bug:
4541201
Change-Id: I2644dfe5e5a36a91e70ecf49300c82bf1eef2269
Michael Jurka [Sat, 4 Jun 2011 01:43:21 +0000 (18:43 -0700)]
Merge "fix the build"
Michael Jurka [Sat, 4 Jun 2011 01:43:17 +0000 (18:43 -0700)]
Merge "Fix issue with missing row/column on workspace"
Michael Jurka [Sat, 4 Jun 2011 01:42:05 +0000 (18:42 -0700)]
fix the build
Michael Jurka [Sat, 4 Jun 2011 00:58:50 +0000 (17:58 -0700)]
Merge "Fixing bug with layout of PagedViewCellLayoutChildren"
Michael Jurka [Thu, 2 Jun 2011 23:41:34 +0000 (16:41 -0700)]
Fixing bug with layout of PagedViewCellLayoutChildren
Change-Id: I3fa34ad500632c4b257973aca9be0cb1bda5884a
Michael Jurka [Sat, 4 Jun 2011 00:56:08 +0000 (17:56 -0700)]
am
5e9d734d: am
330ed29d: am
f8e0c76e: Making customize mode tabs more compact
* commit '
5e9d734d59fb28c8a8c3ca3676d12796e19629a2':
Making customize mode tabs more compact
Michael Jurka [Sat, 4 Jun 2011 00:56:01 +0000 (17:56 -0700)]
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
Michael Jurka [Sat, 4 Jun 2011 00:55:58 +0000 (17:55 -0700)]
am
1ed01c88: (-s ours) am
c9fa2b76: am
2478480a: Fixing bug with layout of PagedViewCellLayoutChildren
* commit '
1ed01c884bdce3051a8c5dfc2c7a48613f5f3e75':
Fixing bug with layout of PagedViewCellLayoutChildren
Michael Jurka [Fri, 3 Jun 2011 21:43:36 +0000 (14:43 -0700)]
am
b82cc0cc: am
1fd2c158: am
32271c3d: Tweak calculation for number of columns and rows
* commit '
b82cc0cc9b61eef0670dc7fddc53813455ca2f4d':
Tweak calculation for number of columns and rows
Michael Jurka [Fri, 27 May 2011 23:27:15 +0000 (16:27 -0700)]
Fix issue with missing row/column on workspace
Change-Id: I7b750f66ef1fd5c9b5501763fa1e371b104d03ea
Michael Jurka [Fri, 3 Jun 2011 21:26:53 +0000 (14:26 -0700)]
am
330ed29d: am
f8e0c76e: Making customize mode tabs more compact
* commit '
330ed29d41a263ed8455f734b1688e04e7cb1c98':
Making customize mode tabs more compact
Michael Jurka [Fri, 3 Jun 2011 21:22:52 +0000 (14:22 -0700)]
am
f8e0c76e: Making customize mode tabs more compact
* commit '
f8e0c76e0326440e6371e8eaf88c446e565ee732':
Making customize mode tabs more compact
Michael Jurka [Fri, 3 Jun 2011 21:22:51 +0000 (14:22 -0700)]
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
Michael Jurka [Fri, 3 Jun 2011 21:22:49 +0000 (14:22 -0700)]
am
c9fa2b76: am
2478480a: Fixing bug with layout of PagedViewCellLayoutChildren
* commit '
c9fa2b7668efe1a04015d7d16d069348996ade59':
Fixing bug with layout of PagedViewCellLayoutChildren
Michael Jurka [Fri, 3 Jun 2011 21:18:50 +0000 (14:18 -0700)]
am
a9c683d9: Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2
* commit '
a9c683d97eff5fde190e2e60d25259cea53eab24':
Fixing calculation of # of rows in All Apps
Michael Jurka [Fri, 3 Jun 2011 21:18:49 +0000 (14:18 -0700)]
am
2478480a: Fixing bug with layout of PagedViewCellLayoutChildren
* commit '
2478480a9724804fd363dfa99c42ddfba4c46acc':
Fixing bug with layout of PagedViewCellLayoutChildren
Michael Jurka [Fri, 3 Jun 2011 21:13:42 +0000 (14:13 -0700)]
Making customize mode tabs more compact
- reducing padding in portrait mode
- changed "App shortcuts" -> "Apps"
- fixes issues with Spanish and other languages in portrait mode and small devices
Change-Id: I1e1d57873785421d37cfd9d78f9e6314e49ff1ac
Michael Jurka [Fri, 3 Jun 2011 21:15:44 +0000 (14:15 -0700)]
Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2
Michael Jurka [Fri, 3 Jun 2011 18:21:32 +0000 (11:21 -0700)]
am
4c826609: am
a83ae6bf: am
330ae983: Merge "Fix issue where All Apps tab bar was too small" into honeycomb-mr2
* commit '
4c826609208012e7219ecdacde4348b0dd7973bd':
Fix issue where All Apps tab bar was too small
Eric Fischer [Fri, 3 Jun 2011 17:22:09 +0000 (10:22 -0700)]
Merge "Import revised translations."
Michael Jurka [Fri, 3 Jun 2011 17:09:56 +0000 (10:09 -0700)]
am
6525218e: (-s ours) am
c901ac9a: am
7593662b: Fix issue with missing row/column on workspace
* commit '
6525218e27bbe200cff6d35f5f1e5a80f800d864':
Fix issue with missing row/column on workspace
Winson Chung [Fri, 3 Jun 2011 01:59:36 +0000 (18:59 -0700)]
Re-enabling holographic icons for tomorrow's build.
Change-Id: I2888290638aa0932fff73006e46800529d384b84
Michael Jurka [Fri, 3 Jun 2011 00:43:52 +0000 (17:43 -0700)]
Fixing calculation of # of rows in All Apps
(issue was esp. apparently on 1024x768 devices)
Eric Fischer [Thu, 2 Jun 2011 23:56:59 +0000 (16:56 -0700)]
Import revised translations.
Change-Id: I1dee0b6ae8de15fcee80c8e170f8fc574a403469
Michael Jurka [Thu, 2 Jun 2011 23:41:34 +0000 (16:41 -0700)]
Fixing bug with layout of PagedViewCellLayoutChildren
Winson Chung [Thu, 2 Jun 2011 18:03:38 +0000 (11:03 -0700)]
Merge "Fixing regression in shop icon and widget pane."
Winson Chung [Thu, 2 Jun 2011 17:53:07 +0000 (10:53 -0700)]
Fixing regression in shop icon and widget pane.
Change-Id: I79a17581df2ba17c309626dde33c946855b2d55e
Eric Fischer [Thu, 2 Jun 2011 17:42:18 +0000 (10:42 -0700)]
am
999095a2: (-s ours) am
5bce03e3: am
2c30c859: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
999095a29c4bada97251e33d9f95346207253130':
Import revised translations. DO NOT MERGE
The Android Automerger [Thu, 2 Jun 2011 14:10:43 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Michael Jurka [Thu, 2 Jun 2011 02:09:05 +0000 (19:09 -0700)]
am
1fd2c158: am
32271c3d: Tweak calculation for number of columns and rows
* commit '
1fd2c15858d673eb8bd0940045bc09b6bf73335f':
Tweak calculation for number of columns and rows
Michael Jurka [Thu, 2 Jun 2011 01:34:57 +0000 (18:34 -0700)]
am
32271c3d: Tweak calculation for number of columns and rows
* commit '
32271c3d20939d4fa02d4c84e1d95cefd5c183fd':
Tweak calculation for number of columns and rows
Winson Chung [Thu, 2 Jun 2011 00:28:46 +0000 (17:28 -0700)]
Merge "Adding drag target bar."
Winson Chung [Tue, 31 May 2011 23:50:48 +0000 (16:50 -0700)]
Adding drag target bar.
Change-Id: Ia00ed30264ea5f1d3c919111d15588ef441bfe20
Michael Jurka [Thu, 2 Jun 2011 00:03:13 +0000 (17:03 -0700)]
Tweak calculation for number of columns and rows
Change-Id: I267e369167597b01768a7a9344b2f468d5a046e4
Michael Jurka [Thu, 26 May 2011 22:21:24 +0000 (15:21 -0700)]
remove unused/redundant params to turn on HW accel
Winson Chung [Wed, 1 Jun 2011 19:35:55 +0000 (12:35 -0700)]
Merge "Fixing translateable attribute in strings, and click-through in AppsCustomize."
Adam Cohen [Wed, 1 Jun 2011 18:53:06 +0000 (11:53 -0700)]
Merge "Adding visual feedback for folder creation`"
Winson Chung [Wed, 1 Jun 2011 18:36:23 +0000 (11:36 -0700)]
Merge "Removing wallpapers tab, adding shop icon back."
Michael Jurka [Wed, 1 Jun 2011 18:09:59 +0000 (11:09 -0700)]
resolved conflicts for merge of
d912ce56 to master
Change-Id: Id9d6378d6ddf1c8025fa2fa16b441209db0a3cf7
The Android Automerger [Wed, 1 Jun 2011 14:10:25 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Michael Jurka [Wed, 1 Jun 2011 06:41:37 +0000 (23:41 -0700)]
Adam Cohen [Tue, 31 May 2011 21:30:45 +0000 (14:30 -0700)]
Adding visual feedback for folder creation`
Change-Id: I47de931a07e3614e25f54d1ba5752a54993d6153
Winson Chung [Thu, 26 May 2011 21:36:06 +0000 (14:36 -0700)]
Removing wallpapers tab, adding shop icon back.
Change-Id: I90bb107cce033ecb78a8fe365aa99c641a492b48
Winson Chung [Wed, 1 Jun 2011 00:28:12 +0000 (17:28 -0700)]
Fixing translateable attribute in strings, and click-through in AppsCustomize.
Change-Id: I8ceff05f5d38021c74731cddf71391b55049b2af
Adam Cohen [Tue, 31 May 2011 22:52:28 +0000 (15:52 -0700)]
Adding padding to widgets on large devices
Change-Id: Ib1d75687deb26008c1010ca10deb9ea3c374e8a5
Michael Jurka [Tue, 31 May 2011 22:05:48 +0000 (15:05 -0700)]
am
a83ae6bf: am
330ae983: Merge "Fix issue where All Apps tab bar was too small" into honeycomb-mr2
* commit '
a83ae6bf3e2367162230df19263b40d442d728d1':
Fix issue where All Apps tab bar was too small
Michael Jurka [Tue, 31 May 2011 22:01:50 +0000 (15:01 -0700)]
am
330ae983: Merge "Fix issue where All Apps tab bar was too small" into honeycomb-mr2
* commit '
330ae9835c920d4bdba43806d733c350991d0dcf':
Fix issue where All Apps tab bar was too small
Michael Jurka [Tue, 31 May 2011 22:00:29 +0000 (15:00 -0700)]
Merge "Fix issue where All Apps tab bar was too small" into honeycomb-mr2
Adam Cohen [Tue, 31 May 2011 20:05:46 +0000 (13:05 -0700)]
Merge "Implementing new visualization for folder icon"
Michael Jurka [Fri, 27 May 2011 23:27:15 +0000 (16:27 -0700)]
Fix issue with missing row/column on workspace
Change-Id: I7b750f66ef1fd5c9b5501763fa1e371b104d03ea
Michael Jurka [Tue, 31 May 2011 17:48:20 +0000 (10:48 -0700)]
am
c901ac9a: am
7593662b: Fix issue with missing row/column on workspace
* commit '
c901ac9a6f41305998789bf9017fb62dc829c05c':
Fix issue with missing row/column on workspace
Michael Jurka [Fri, 27 May 2011 00:10:29 +0000 (17:10 -0700)]
Fix issue where All Apps tab bar was too small
Change-Id: I702ca5ce32a6346f09c61765aa63625d3d50cc92
OSDN Git Service
