23348 Commits

Author SHA1 Message Date
Andy McFadden
503f5301cd Merge "Relocate common Calendar classes" 2011-07-11 11:24:23 -07:00
Fabrice Di Meglio
aa69594032 Merge "Fix View reset of layoutDirection and textDirection" 2011-07-11 10:52:09 -07:00
Freeman Ng
8516448ea8 Merge "remove old style button bar look" 2011-07-11 10:46:12 -07:00
Mike Lockwood
e6d24ab6a9 Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system" 2011-07-11 10:41:08 -07:00
Mike Lockwood
7a59dd2ce3 MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system
Bug: 4561836

Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 13:40:02 -04:00
Fabrice Di Meglio
7f86c806ad Fix View reset of layoutDirection and textDirection
- do it in onDetachedFromWindow()
- make naming consistent too
- update unit tests

Change-Id: I320fcdbf75166bae793c4409e7344608b696667f
2011-07-11 10:39:29 -07:00
Freeman Ng
6bc6de6737 remove old style button bar look
bug: 4524233
Change-Id: Ie41f760258b7b673264d802c7dcc554b226e0e6e
2011-07-10 18:35:19 -07:00
Jeff Sharkey
104344e507 Cached NTP time for system services.
Uses NTP server and timeout from secure settings, or fallback to
defaults in resources.  Update various system services to use cached
NTP time when fresh enough, or force updates as needed.

Bug: 4517273
Change-Id: Ie1c4c4883836013d02ca0bbd850cf8949f93b34b
2011-07-10 14:25:18 -07:00
Elliott Hughes
b7440a140b Merge "Pass the targetSdkVersion through to the zygote-forked dalvik." 2011-07-08 18:11:41 -07:00
Wink Saville
0d171a66a4 Merge "resolved conflicts for merge of e4a56a32 to master" 2011-07-08 17:48:37 -07:00
Elliott Hughes
e1dfcb7ab0 Pass the targetSdkVersion through to the zygote-forked dalvik.
This will let dalvik implement backwards-compatibile behaviors based on
an app's targetSdkVersion.

Bug: 4772166
Change-Id: I935c5ea9144e8b4e6e21089547287486e2234b7f
2011-07-08 16:54:16 -07:00
Shimeng (Simon) Wang
e5f5e82027 Merge "Prevent set mInitialScale being overridden by mDefaultScale." 2011-07-08 16:48:23 -07:00
Andy McFadden
64a3b34afa Relocate common Calendar classes
Move some classes from android.pim to com.android.calendarcommon.

Bug 4575374

Change-Id: Iab09cb331a0a74f6b951ab5e5b7c207e8f1b939c
2011-07-08 16:20:13 -07:00
Gilles Debunne
db13e87983 Merge "Fleshed up SuggestionSpan documentation. Bug 4553472" 2011-07-08 16:02:36 -07:00
Romain Guy
c7a8be7fc4 Merge "Always redraw the UI on orientation change Bug #4994715" 2011-07-08 15:54:10 -07:00
Romain Guy
7e1160e866 Always redraw the UI on orientation change
Bug #4994715

In some cases, on some architectures, the hardware renderer could fail
to properly render a window after an orientation change. The fix is
to force the GL driver to drop any existing buffer to make sure the
next buffer used to draw has the correct geometry.

This change also fixes an issue that was preventing partial screen
updates from being properly enabled.

Change-Id: I874a48590845a8624425130af7db8e20022895dd
2011-07-08 15:49:50 -07:00
Adam Powell
36f469fa46 The COLORS!!
Add theme attributes and public color resources. Apps can now query
the current theme's various highlight colors. Commonly used color
values for Holo are now available.

Change-Id: If24dc9ee243e740e8caaddf0b78590783fa228c8
2011-07-08 15:36:33 -07:00
RoboErik
bb594dcdb4 Merge "Unhide CalendarContract apis" 2011-07-08 15:28:26 -07:00
Gilles Debunne
4dacef2566 Fleshed up SuggestionSpan documentation. Bug 4553472
Change-Id: I3b5be9a6da79398b03d98eb33eb61a55fd702960
2011-07-08 15:24:29 -07:00
RoboErik
3672696dc5 Unhide CalendarContract apis
This exposes the set of apis necessary to unbundle the Calendar
app and sync adapters as well as allowing third party developers
to officially access the calendar provider. This is the current
final set of apis to expose, though changes may occur if we
discover new issues. The documentation and CTS tests are still
in progress.

Change-Id: If77f9a1d49a26725b44b1014e8d088be7ffbc707
2011-07-08 15:18:17 -07:00
Jaikumar Ganesh
7b588b04f5 Merge "Get server's listening channel" 2011-07-08 15:01:18 -07:00
Shimeng (Simon) Wang
1151fe78fc Prevent set mInitialScale being overridden by mDefaultScale.
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
2011-07-08 14:38:38 -07:00
Ben Dodson
6d8b80dd8c Get server's listening channel
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
2011-07-08 14:36:42 -07:00
RoboErik
b3a86c86e7 Merge "Pseudo-final api fixes to CalendarContract" 2011-07-08 14:05:42 -07:00
RoboErik
58644028f9 Pseudo-final api fixes to CalendarContract
This removes the public projections and makes them arguments
that are passed in instead.

Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
2011-07-08 13:48:53 -07:00
Wink Saville
ae367419df resolved conflicts for merge of e4a56a32 to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
2011-07-08 12:49:14 -07:00
Christopher Tate
f24ee7f1f5 Merge "Can now restore a subset of apps from historical dataset" 2011-07-08 12:48:48 -07:00
John Reck
effa7523f4 Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Christopher Tate
284f1bb4da Can now restore a subset of apps from historical dataset
Adds the ability to filter a restore of an historical dataset so that it
only restores certain apps' data regardless of what is actually present
in the dataset.  This is currently only used by the bmgr command-line tool,
for debugging / developer support.

Bug 2021590

Change-Id: I7685e5d609b0f5506f71d70c26410602bb387659
2011-07-08 12:28:48 -07:00
Wink Saville
d5cabff96a am a736cd54: am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit 'a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
2011-07-08 12:28:27 -07:00
Romain Guy
44476779ae Merge "Correctly position layers." 2011-07-08 11:58:18 -07:00
Romain Guy
b2479153b7 Correctly position layers.
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
2011-07-08 11:57:29 -07:00
Kristian Monsen
7cec24f747 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
John Reck
d4324aa101 NPE guard in setupViewport
Bug: 4163660

Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
2011-07-08 11:23:39 -07:00
Narayan Kamath
6dabb63307 Add event-log logging for TTS requests.
Change-Id: I5023194c469a602b85259088a2e59373c96a941e
2011-07-08 17:55:25 +01:00
Wink Saville
e4a56a32ac am 8171e6f6: Use resetConnections with resetMask.
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
2011-07-08 09:40:08 -07:00
Wink Saville
a736cd54e1 am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
2011-07-08 09:40:03 -07:00
Kristian Monsen
918b183295 Merge Chromium at r12.0.742.93: New autofill string
Added a string that we now use.

Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
2011-07-08 16:45:10 +01:00
Adam Powell
7024e0b902 Merge "Add ALL CAPS style to TextView/TextAppearance" 2011-07-07 20:55:10 -07:00
Romain Guy
69abbd8791 Merge "Use NEAREST filtering for layers whenever possible." 2011-07-07 20:55:08 -07:00
Romain Guy
9ace8f5e79 Use NEAREST filtering for layers whenever possible.
Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
2011-07-07 20:50:11 -07:00
Adam Powell
7f8f79a1ff Add ALL CAPS style to TextView/TextAppearance
Switch out ugly hack in action menu items for the new style.

Change-Id: I68a0ed62a352b14d499e6478b82bbc12dcb5a030
2011-07-07 20:39:41 -07:00
Shimeng (Simon) Wang
ab5a5e6748 Merge "Update viewport asap." 2011-07-07 16:17:16 -07:00
Wink Saville
8171e6f690 Use resetConnections with resetMask.
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
2011-07-07 16:17:06 -07:00
Gilles Debunne
08009f1446 Merge "XmlDocumentProvider moved to the XmlAdapter sample code" 2011-07-07 16:07:07 -07:00
Shimeng (Simon) Wang
56bd4349fc Update viewport asap.
Update viewport as soon as possible to make sure layout has correct viewport.

This helps fixes gmail flickering issue.

Also helps the case a mobile site is switched to desktop when the
user agent is switched.

issue: 4723800
Change-Id: I3dc9e52d912d49478d562cec3f38d653a563715e
2011-07-07 15:26:22 -07:00
Huahui Wu
1d19c18f9b Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."" 2011-07-07 15:10:25 -07:00
Huahui Wu
98933f3f68 Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."
This reverts commit 6e64e0c61720244894dbd1fd6b36394adc63b2de.
It introduced a null pointer crash for pinch-and-zoom.

Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
2011-07-07 14:58:37 -07:00
Adam Powell
eea5be5447 Merge "Action bar layout tweaks" 2011-07-07 14:35:22 -07:00
Philip Milne
6d836b606b Merge "Simplify and tidy the API for maximum value support." 2011-07-07 14:30:31 -07:00