21663 Commits

Author SHA1 Message Date
Daisuke Miyakawa
56ed7038b9 Merge "Remove an unnecessary word from javadoc" 2011-05-10 17:41:44 -07:00
Daisuke Miyakawa
979154ffd3 Remove an unnecessary word from javadoc
Change-Id: I6e24f72d547753ff40c7a09e95e9b28e13828f1e
2011-05-10 17:18:55 -07:00
Dianne Hackborn
fd26ed1a28 Merge "resolved conflicts for merge of 05be6d6f to master" 2011-05-10 10:59:29 -07:00
Kristian Monsen
39201b017f Merge "Deprecating webkit API's that might not be supported in the future" 2011-05-10 10:57:52 -07:00
Kristian Monsen
fc77165d44 Deprecating webkit API's that might not be supported in the future
Change-Id: I992ae207f29a95daff991768cc6fe190471978cd
2011-05-10 16:53:51 +01:00
Ben Murdoch
bb40896e66 Merge WebKit at r74534: Update browser user agent.
Change-Id: I6959d2f1f9b69209deb255e442791f6447fe6b05
2011-05-10 15:38:51 +01:00
Kristian Monsen
cbb59db7ee Enable platform notifications for chrome http stack
Change-Id: I386aef25010c95b15fb6a8edc96e59e538540306
2011-05-10 14:13:16 +01:00
Dianne Hackborn
aa9d84c37e resolved conflicts for merge of 05be6d6f to master
Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212
2011-05-09 19:00:59 -07:00
Dianne Hackborn
05be6d6fe0 am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
* commit '4907d1d5e2c7d244b07579b8c52153df69754e85':
  Better compat mode part one: start scaling windows.
2011-05-09 17:10:34 -07:00
Dianne Hackborn
4907d1d5e2 am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
* commit '0c6cbf410a642f6e9cea7cca0a6e53a4a3cdd324':
  Better compat mode part one: start scaling windows.
2011-05-09 17:08:40 -07:00
Dianne Hackborn
e2515eebf4 Better compat mode part one: start scaling windows.
First step of improving app screen size compatibility mode.  When
running in compat mode, an application's windows are scaled up on
the screen rather than being small with 1:1 pixels.

Currently we scale the application to fill the entire screen, so
don't use an even pixel scaling.  Though this may have some
negative impact on the appearance (it looks okay to me), it has a
big benefit of allowing us to now treat these apps as normal
full-screens apps and do the normal transition animations as you
move in and out and around in them.

This introduces fun stuff in the input system to take care of
modifying pointer coordinates to account for the app window
surface scaling.  The input dispatcher is told about the scale
that is being applied to each window and, when there is one,
adjusts pointer events appropriately as they are being sent
to the transport.

Also modified is CompatibilityInfo, which has been greatly
simplified to not be so insane and incomprehendible.  It is
now simple -- when constructed it determines if the given app
is compatible with the current screen size and density, and
that is that.

There are new APIs on ActivityManagerService to put applications
that we would traditionally consider compatible with larger screens
in compatibility mode.  This is the start of a facility to have
a UI affordance for a user to switch apps in and out of
compatibility.

To test switching of modes, there is a new variation of the "am"
command to do this: am screen-compat [on|off] [package]

This mode switching has the fundamentals of restarting activities
when it is changed, though the state still needs to be persisted
and the overall mode switch cleaned up.

For the few small apps I have tested, things mostly seem to be
working well.  I know of one problem with the text selection
handles being drawn at the wrong position because at some point
the window offset is being scaled incorrectly.  There are
probably other similar issues around the interaction between
two windows because the different window coordinate spaces are
done in a hacky way instead of being formally integrated into
the window manager layout process.

Change-Id: Ie038e3746b448135117bd860859d74e360938557
2011-05-09 17:03:24 -07:00
Teng-Hui Zhu
b109c88771 Exit full screen support on java side
bug:4312214

Change-Id: Id3c755db0a824d42f1f8d1a0952f63d2078d163a
2011-05-09 14:56:19 -07:00
Marco Nelissen
04f32bdfd2 Merge "Fix mode." 2011-05-09 14:49:36 -07:00
Marco Nelissen
19399f4ed6 Fix mode.
Change-Id: I94813a4a73ea3a7b11e0747fda479be87e697072
2011-05-09 14:06:57 -07:00
Marco Nelissen
f470ced7cd Merge "When using O_CREAT, the mode should be specified." 2011-05-09 13:03:43 -07:00
Marco Nelissen
d868913728 When using O_CREAT, the mode should be specified.
Change-Id: Id364072fce62388eba47207a97800eb185480633
2011-05-09 12:46:56 -07:00
The Android Automerger
bdaa3abdf2 am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit '44e39d608cfddcbf56123480123822f26f20f259':
  DO NOT MERGE Handle GET_POWER failures
  DO NOT MERGE: Don't send pause again when coming back from full screen
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
  DO NOT MERGE MTP: Implement GetThumb command
  DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
  DO NOT MERGE MTP: Add extended operations to support in-place editing of files
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
  DO NOT MERGE Fix media scanner uri handling.
  DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
  DO NOT MERGE MTP and media provider support for multiple storage devices:
  DO NOT MERGE MountService: Fix running media scanner at boot.
  DO NOT MERGE Fix deadlock in MountService
  DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
  DO NOT MERGE MountService: Add support for multiple volumes
2011-05-09 10:40:14 -07:00
satok
9aabb95781 Add one shot flag to the subtype
Bug: 4257258

Change-Id: I21da9e11c882eea056beb84a2dfb0f28da8a98b1
2011-05-09 19:40:12 +09:00
The Android Automerger
44e39d608c Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:38:02 -07:00
Irfan Sheriff
c351f52a4a DO NOT MERGE Handle GET_POWER failures
Return a failure when GET_POWER returns a non-conforming
format

Bug: 4380317
Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
2011-05-06 15:06:30 -07:00
Marco Nelissen
1b312039a0 Remove MediaStore.Audio.AudioColumns.ALBUM_ART
This column doesn't actually exist in the corresponding table, and
never has, so the presence of this definition is confusing.

Change-Id: I199f9a8effbdc9f45d51060830e3ad83675a0dff
2011-05-06 14:55:48 -07:00
Chet Haase
c54ed966f7 Minor javadoc enhancements
Change-Id: Ic24bb0e1e669989f0cae3a9b8fa064b38c8e7948
2011-05-06 14:14:20 -07:00
Gilles Debunne
d9fd3d5ca9 Merge "All SuggestionSpans are removed when the window loses focus." 2011-05-06 10:52:23 -07:00
RoboErik
6efb30f40a Adds Calendars sync only columns to the contract
Change-Id: I76d649f52e5f2a8bde4b52036df3366c5c5a979a
2011-05-06 09:17:46 -07:00
Wu-cheng Li
dd01e5b79f Merge "Improve camera javadoc." 2011-05-06 00:13:47 -07:00
Adam Powell
2942332b85 Merge "Fix bug 4383987 - animate action modes with split action bars" 2011-05-05 18:44:30 -07:00
Adam Powell
5c1cb19f40 Fix bug 4383987 - animate action modes with split action bars
Change-Id: I6aa800ae12ef51d1ba79f059ede7413d662a7d1a
2011-05-05 18:42:16 -07:00
Daniel Sandler
63dfeee637 Merge "Consolidate notification layouts by removing xlarge versions." 2011-05-05 17:07:59 -07:00
Patrick Dubroy
b51cc1dd63 Merge "Only delay pressed feedback for Views inside a scrolling parent" 2011-05-05 14:59:35 -07:00
Patrick Dubroy
e0a799a2ac Only delay pressed feedback for Views inside a scrolling parent
Add a method on ViewGroup to determine whether it supports scrolling.
This allows us to show the pressed feedback immediately in many cases,
improving responsiveness of buttons, etc.

This patch also lengthens the timeout in order to reduce flashes
when the user is scrolling.

Change-Id: Ieb91ae7a1f8e8f7e87448f2a730381a53947996f
2011-05-05 14:49:20 -07:00
Teng-Hui Zhu
a8f6a0d90c DO NOT MERGE: Don't send pause again when coming back from full screen
When we enter full screen, the inline video has been paused.
When we re-play in the inline mode, we don't need to paused the previous video,
which is the full screen one.

bug:4259109
Change-Id: I577edf43563116b0d1a9266d741e6a8aabbca779
2011-05-05 14:34:26 -07:00
Gilles Debunne
9de128ef79 Merge "Off by one bug in TextView's suggestions popup." 2011-05-05 10:08:59 -07:00
Chet Haase
ed30fd8e9a Add ability for hierarchyviewer to output displaylist info
Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Iad05f5f6cca0f8b465dccd962b501dc18fe6e053
2011-05-05 07:35:40 -07:00
Steve Block
098b781699 Merge "Log an error message if WebView methods are called on the wrong thread." 2011-05-05 04:36:27 -07:00
Steve Block
51b0891038 Log an error message if WebView methods are called on the wrong thread.
All public WebView methods should be called on the UI thread. This
change adds a check to all public non-inherited methods, other than
those that have always been hidden.

Bug: 4373919
Change-Id: I573fc704faa58287a7b14a971958fa5417855d70
2011-05-05 12:31:05 +01:00
Wu-cheng Li
26274fae33 Improve camera javadoc.
Preview has to be stopped before chaning preview size.

Change-Id: I6ab30402b2270eed9606a69ebce43ae58e0776a8
2011-05-05 14:36:28 +08:00
Irfan Sheriff
33bf60a3fc am 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
* commit '86654eda96b005ea21bfe4d29cd042187e497a8f':
  Handle GET_POWER failures
2011-05-04 21:22:29 -07:00
Irfan Sheriff
86654eda96 am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
  Handle GET_POWER failures
2011-05-04 21:19:19 -07:00
Irfan Sheriff
8a14d8b9c0 am 1a5b6098: Handle GET_POWER failures
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
  Handle GET_POWER failures
2011-05-04 21:14:47 -07:00
Chet Haase
a17de9b493 Revert "Add ability for hierarchyviewer to output displaylist info"
This reverts commit b2a4b52e8d5e499d33e2765e8c47851bf0266299.
2011-05-04 18:23:12 -07:00
Joe Onorato
f2a4568afc Merge "Fix race conditions in WakeLocks." 2011-05-04 18:13:10 -07:00
Joe Onorato
d7350e3a56 Fix race conditions in WakeLocks.
Bug: 3439332
Change-Id: I70c583e6a73960df8faad69675947b87642c6228
2011-05-04 18:10:19 -07:00
Jeff Sharkey
2a2dc6894a Merge "Return NetworkStats bundle from NM service." 2011-05-04 17:49:01 -07:00
Chet Haase
42a3a39e23 Merge "Add ability for hierarchyviewer to output displaylist info" 2011-05-04 17:30:30 -07:00
Chet Haase
b2a4b52e8d Add ability for hierarchyviewer to output displaylist info
Clicking on a node in hierarchyviewer1 and hierarchyviewer2 and then
clicking the new "Dump DisplayList" button will cause the display
list for the selected node (including its children) to be output into
logcat.

Change-Id: Id32f62569ad1ab4d533bc62987f3a7390c1bb4e6
2011-05-04 17:18:27 -07:00
Robert Greenwalt
a9faac5554 am 5673c13b: am aacd80fd: Fix build break.
* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
  Fix build break.
2011-05-04 16:59:47 -07:00
Robert Greenwalt
5673c13b51 am aacd80fd: Fix build break.
* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
  Fix build break.
2011-05-04 16:55:26 -07:00
Robert Greenwalt
aacd80fd87 Fix build break.
Change-Id: Ic61448f468fb97a2ae032bf5782b33ed8972e20f
2011-05-04 16:50:10 -07:00
Jeff Sharkey
9a13f36cdd Return NetworkStats bundle from NM service.
Introduce NetworkStats which is a collection of network statistics,
which should match the structure communicated by kernel module through
netd.  Will introduce tags and fg/bg stats later.  Kept entirely in a
flat data structure to optimize parcel speed.

Initial pass at returning NetworkStats from NetworkManagementService,
both summary and details.  Will eventually pull data from kernel module
over netd connection.

Change-Id: I92d9f61678ec8c22e2ce26775fb035a0cf32413f
2011-05-04 16:07:21 -07:00
Gilles Debunne
ba4997ac35 All SuggestionSpans are removed when the window loses focus.
SuggestionSpans should have a limited, well defined life-span.
Saving these in onSaveInstanceState is inappropriate since these can
be very large and will not necessarily be saved/loaded by the application.

Keeping them in the application when it is dismissed is not consistent
since they may be garbage collected while the application is not active.

Change-Id: Icebf6cb0218528f9d162a689ad33efeb770fbede
2011-05-04 14:28:38 -07:00