Commit Graph

49925 Commits

Author SHA1 Message Date
Brad Fitzpatrick 76275ac1c5 resolved conflicts for merge of 700889f5 to master
Change-Id: I85320de6483e6820fe27b4012bfc323ccafa0e04
2010-10-12 13:52:44 -07:00
The Android Automerger bd2df7405f Merge branch 'master' into honeycomb-release 2010-10-12 06:48:50 -07:00
Brad Fitzpatrick adb4229c23 am 02e53429: Merge "Don\'t block the UI when rearranging icons." into gingerbread
Merge commit '02e53429c4ef01bee548e0eaba4aeeee99db35f4'

* commit '02e53429c4ef01bee548e0eaba4aeeee99db35f4':
  Don't block the UI when rearranging icons.
2010-10-11 17:43:21 -07:00
Gilles Debunne 92ac48d931 am 63196c11: Merge "Changed Grid layout on home. More space at the bottom." into gingerbread
Merge commit '63196c1162d7bf4bf253368236f9442a78067914' into gingerbread-plus-aosp

* commit '63196c1162d7bf4bf253368236f9442a78067914':
  Changed Grid layout on home. More space at the bottom.
2010-10-11 17:31:01 -07:00
Gilles Debunne 63196c1162 Merge "Changed Grid layout on home. More space at the bottom." into gingerbread 2010-10-11 17:13:19 -07:00
Jean-Baptiste Queru e90cc3ba6c resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp
Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080
2010-10-11 14:44:10 -07:00
Jean-Baptiste Queru 35e79e3280 Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()" 2010-10-11 14:33:45 -07:00
Jeff Brown 2b39855b9b am 0db354cb: (-s ours) Snap workspace back to screen on ACTION_CANCEL.
Merge commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88'

* commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88':
  Snap workspace back to screen on ACTION_CANCEL.
2010-10-11 11:29:27 -07:00
Brad Fitzpatrick 700889f504 Serialize background async db updates
Bug: 2983765
Change-Id: I1fdd33ea8ee4fbc79a75ce0450f04d8e18915975
2010-10-11 10:10:40 -07:00
The Android Automerger daa372b44f Merge branch 'master' into honeycomb-release 2010-10-11 06:47:43 -07:00
Gilles Debunne 510338d921 am 1a1c76e6: New hotseat assets.
Merge commit '1a1c76e69ab43b8519e94cc6dc0c1165c03873d9'

* commit '1a1c76e69ab43b8519e94cc6dc0c1165c03873d9':
  New hotseat assets.
2010-10-10 19:11:34 -07:00
Jason Sams c4d61fc0f5 Merge "Update to use SurfaceConfig." 2010-10-10 18:05:04 -07:00
The Android Automerger dc7f01c00c Merge branch 'master' into honeycomb-release 2010-10-10 16:22:59 -07:00
Jason Sams e5806ba2bf Update to use SurfaceConfig.
Change-Id: Ic99c1406ef8f51fdf7d9d44e378eeb0bb701a69e
2010-10-10 16:18:57 -07:00
Michael Jurka b8f0672d7c Snap workspace back to screen on ACTION_CANCEL.
Bug: 3066123
2010-10-10 16:01:05 -07:00
Brad Fitzpatrick 02e53429c4 Merge "Don't block the UI when rearranging icons." into gingerbread 2010-10-10 15:49:12 -07:00
Brad Fitzpatrick ade2f8122f Don't block the UI when rearranging icons.
The pause is mostly notable when a sync is happening at the same time.

The related function addItemToDatabase() is unchanged by this CL
though as it populates item.id and would need more invasive changes
elsewhere.

Change-Id: I6538445aeb15d9efedf99f262c39f6175f7f1e0e
2010-10-10 15:42:06 -07:00
Michael Jurka c86756c201 Fixed 3073371: Home screen locked after app launch
Change-Id: Iedac4b94d20cc3352aa247c58978a8f60df1a09f
2010-10-10 15:27:31 -07:00
Michael Jurka 3e7c763453 updated Workspace thumbnail behavior
- in All Apps mode, fade thumbnails completely
- while dragging, have thumbnails re-appear
- while dragging, give screen thumbnails that can accept drops a different appearance (green outline instead of blue)

Change-Id: I72ddf8a0f1947d35ef11514b7d4eea9ae5eee6e2
2010-10-10 15:03:45 -07:00
Joe Onorato 5eb7fff487 am 673aefe8: Merge "When the SD card comes back, we need to show the apps on it." into gingerbread
Merge commit '673aefe8b2b27790d704cc15282c8989a132877b'

* commit '673aefe8b2b27790d704cc15282c8989a132877b':
  When the SD card comes back, we need to show the apps on it.
2010-10-10 11:26:02 -07:00
Gilles Debunne 87fccaa075 am d2e0ab36: Revert "Changed Grid layout on home. More space at the bottom."
Merge commit 'd2e0ab363d46bcaa8fe515e0403eec1ad044134e'

* commit 'd2e0ab363d46bcaa8fe515e0403eec1ad044134e':
  Revert "Changed Grid layout on home. More space at the bottom."
2010-10-10 11:25:57 -07:00
Patrick Dubroy 49250ad530 Fix bug with dragging crosshairs sometimes being too bright
Change-Id: Ieb20ab96e73c5f297ffd69d29472024c11978a13
2010-10-10 11:18:29 -07:00
Eric Fischer 110cc0515c am fc223d96: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'fc223d969b62e5269351cabede7f10738d643e24'

* commit 'fc223d969b62e5269351cabede7f10738d643e24':
  Import revised translations.  DO NOT MERGE
2010-10-10 09:06:56 -07:00
Gilles Debunne ca931dd2e8 am 1639986f: Merge "Changed Grid layout on home. More space at the bottom." into gingerbread
Merge commit '1639986f7229df6083b74419d02de68799dfbadc'

* commit '1639986f7229df6083b74419d02de68799dfbadc':
  Changed Grid layout on home. More space at the bottom.
2010-10-10 09:06:53 -07:00
Gilles Debunne 47810cb968 am d4c00829: New hot seat assets
Merge commit 'd4c008292f3667f864ae552cf4878c810d018435'

* commit 'd4c008292f3667f864ae552cf4878c810d018435':
  New hot seat assets
2010-10-10 09:06:47 -07:00
Stephen Hines b41dbd6d0c Merge "Remove now unnecessary pragma rs export_var()." 2010-10-09 00:23:45 -07:00
Jeff Brown 0db354cba9 Snap workspace back to screen on ACTION_CANCEL.
Bug: 3066123
Change-Id: Icbdf3ef241ec44b5569e7490c1b950d80699ddc8
2010-10-08 22:53:33 -07:00
Michael Jurka 9987a5c45e Fixed 3066306 Widget measurement wrong in customize tray 2010-10-08 16:58:12 -07:00
Stephen Hines b02af38110 Remove now unnecessary pragma rs export_var().
Change-Id: I2863a2f583af648677d2e53ef4167870fd532c5e
2010-10-08 15:52:00 -07:00
Michael Jurka 4516c11039 Fixed dragging over mini-screens
- during dragging, finding the mini-screen closest to the touch point

Change-Id: I4d967803b85de8af3208511c60c1f3bf5691718f
2010-10-08 15:06:43 -07:00
Gilles Debunne 1a1c76e69a New hotseat assets.
Change-Id: I5505d267076de39cb3fabd0fa7419adc3f619d39
2010-10-08 15:00:59 -07:00
Patrick Dubroy 130c37d309 Merge "fix 3049894: Require fiddle or longer timeout for subsequent page flips" 2010-10-08 10:32:10 -07:00
The Android Automerger cd6914a8e8 Merge branch 'master' into honeycomb-release 2010-10-08 08:48:02 -07:00
Adam Cohen 21f12b52a5 -Changing page scroll click regions
-Cleaning up code for page rotations

Change-Id: I046784b108186b6627ce0df3aed57d70c303ef23
2010-10-07 18:20:49 -07:00
Patrick Dubroy a16fd5a6bd fix 3049894: Require fiddle or longer timeout for subsequent page flips
After initiating a scroll while dragging an item on the home screen, don't flip
so quickly to the next page. Instead, require a bit of additional movement to
trigger the next scroll.
2010-10-07 16:49:10 -07:00
Gilles Debunne a8b84327e0 Changed Grid layout on home. More space at the bottom.
Bug: http://b/issue?id=3053235

This is a proper way to do what was done in https://android-git.corp.google.com/g/#change,71522

The longAxisEndPadding used to be equal to button_bar_height.
Increased it to match proposed mock from designers and increase space
between last row and hot seats buttons.

Change-Id: I31dfba0a3e90a30f18d42b16681592d9527517d4
2010-10-07 11:58:44 -07:00
Joe Onorato 673aefe8b2 Merge "When the SD card comes back, we need to show the apps on it." into gingerbread 2010-10-07 11:42:22 -07:00
Joe Onorato cec583352c When the SD card comes back, we need to show the apps on it.
The problem was that we were doing startLoader, but once the
apps are loaded, all that does is re-bind everything.  Before
a recent change of mine, we were clearing mWorkspaceLoaded and
mAllAppsLoaded.  But that's not good either, because it meant
that there needed to be a lock that the main thread and the
worker thread were both acquiring, which was causing ANRs.

Instead, now we schedule two messages - one to add the apps
back into the list, and one to update everything to use
those new icons.

Bug: 3065061
Change-Id: If9d36d4b55a7ba72fcf48a5ed8941bb9466bebe6
2010-10-07 14:37:40 -04:00
Chet Haase 00397b1d92 Use new TimeInterpolator interface for interpolation
Change-Id: I53e8fcbabfdb4cb69bec309aeceeddc63e1715ed
2010-10-07 11:13:36 -07:00
Gilles Debunne d2e0ab363d Revert "Changed Grid layout on home. More space at the bottom."
This reverts commit 372ca9736e.

Change-Id: I5c5df72067bd17b14c8afc7b7869a50a0198f9ac
2010-10-07 11:04:32 -07:00
Joe Onorato 37265ef6a7 Fix crash on phones about no resource.
Bug: 3039845
Change-Id: If7b08eafd3fe6cdfc75a92ddcf463371359c3633
2010-10-07 11:44:50 -04:00
The Android Automerger 61e6c46b99 Merge branch 'master' into honeycomb-release 2010-10-07 06:45:01 -07:00
Michael Jurka c0e8fcae49 Fixing state transition bugs
- explicitly keeping track of state in Workspace
- cancelling animations before starting new ones
- adding additional state variable for workspace for in-progress transitions
- updating Scroller object if we jump to a certain location

Change-Id: I5ddf51bae543ec89b2a44ab651d7269eb4859a6d
2010-10-06 17:54:12 -07:00
Patrick Dubroy 1262e36948 wip 3029324: Implement new drag feedback
- Show page borders when dragging
- Enlarge scroll region (landscape only)
- When inside scroll region, show green border on adjacent page
2010-10-06 17:39:05 -07:00
Eric Fischer fc223d969b Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:48 -07:00
Eric Fischer 8a3a0753a0 Import revised translations. DO NOT MERGE
Change-Id: Id10c202123114a32708d7def3942b900f1d5933b
2010-10-06 17:13:05 -07:00
Winson Chung 7ed39f3362 am 6a5f4d85: Merge "Adding more specific title for pick-application dialog." into gingerbread
Merge commit '6a5f4d8526944ad4189072543ec4cc3f6d638b6f'

* commit '6a5f4d8526944ad4189072543ec4cc3f6d638b6f':
  Adding more specific title for pick-application dialog.
2010-10-06 17:09:10 -07:00
Gilles Debunne 1639986f72 Merge "Changed Grid layout on home. More space at the bottom." into gingerbread 2010-10-06 16:51:18 -07:00
Alex Sakhartchouk b2f988d15c Merge "Changing texture coord from vec4 to vec2" 2010-10-06 16:10:15 -07:00
Gilles Debunne d4c008292f New hot seat assets
Change-Id: I95ebf95f6eb0d24a88e1726acbb9e2498965d180
2010-10-06 14:46:27 -07:00