21693 Commits

Author SHA1 Message Date
Wink Saville
1f5e3a1af3 am 9c7c8794: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '9c7c87941446cdd1263a87a8c4cc5672082c7e12':
  Fix initialization of RouteInfo
2011-05-12 14:08:05 -07:00
Wink Saville
9c7c879414 am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
2011-05-12 14:03:31 -07:00
Svetoslav Ganov
b856f43ea7 Merge "Propagating hover events to JavaScript in WebView" 2011-05-12 13:43:35 -07:00
Svetoslav Ganov
7882a7839a Propagating hover events to JavaScript in WebView
Propagating hover events to JavaScript to enable
touch exploration of web content. All hover events
are mapped to mouse move events and then WebKit
generates the appropriate mousemove, mouseover and
mouseout actions.

Change-Id: Ib96cd22baf471df045629ca9e254e5a5f7023961
2011-05-11 18:03:44 -07:00
RoboErik
f32e8d9542 Merge "Update Calendars table to v300" 2011-05-11 16:47:17 -07:00
John Reck
91b1963510 Merge "Add ROOT_ID to Accounts column" 2011-05-11 16:12:00 -07:00
Kazuhiro Ondo
8c0b528a47 Fix initialization of RouteInfo
IPv6 gateway is not correctly set in RouteInfo

Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c
2011-05-11 16:02:00 -07:00
Jake Hamby
afd28ac6ec am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
  Enable support for SMS national language shift tables.
2011-05-11 13:09:42 -07:00
Joe Onorato
d21ab0e151 am 0fe56853: am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
* commit '0fe56853fd88c34aba37b04be256a0e51c1bbff7':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
2011-05-11 13:07:55 -07:00
Robert Greenwalt
fc82cb170c am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit '441bc9a6f41ca1678a6c965bec7e2f18227ac100':
  Fix the adding of host routes.
2011-05-11 13:07:38 -07:00
Christopher Tate
a0f5bb10a5 Merge "Full local backup infrastructure" 2011-05-11 12:51:31 -07:00
Daniel Sandler
01defe403f Merge changes I21e9629e,I535ed3ba
* changes:
  Create an XML config flag to turn the navbar off.
  It's lights out for you, navigation bar!
2011-05-11 09:31:08 -07:00
Daniel Sandler
1d4d30aebd It's lights out for you, navigation bar!
Views requesting lights out mode will cause the navbar to
disappear (this is useful for viewing videos/photos/etc
using every pixel of the screen).

But there's a catch: any user activity at all will cause the
lights to come back on and the navbar to return.

Change-Id: I535ed3ba9ae7fab3282c402be256add765395b6f
2011-05-11 09:48:52 -04:00
RoboErik
651c02e61f Update Calendars table to v300
Change-Id: I8e922f97733faed800a91ea926e1a3bea229ebea
2011-05-10 18:18:34 -07:00
Christopher Tate
4a627c71ff Full local backup infrastructure
This is the basic infrastructure for pulling a full(*) backup of the
device's data over an adb(**) connection to the local device.  The
basic process consists of these interacting pieces:

1. The framework's BackupManagerService, which coordinates the
   collection of app data and routing to the destination.

2. A new framework-provided BackupAgent implementation called
   FullBackupAgent, which is instantiated in the target applications'
   processes in turn, and knows how to emit a datastream that contains
   all of the app's saved data files.

3. A new shell-level program called "bu" that is used to bridge from
   adb to the framework's Backup Manager.

4. adb itself, which now knows how to use 'bu' to kick off a backup
   operation and pull the resulting data stream to the desktop host.

5. A system-provided application that verifies with the user that
   an attempted backup/restore operation is in fact expected and to
   be allowed.

The full agent implementation is not used during normal operation of
the delta-based app-customized remote backup process.  Instead it's
used during user-confirmed *full* backup of applications and all their
data to a local destination, e.g. via the adb connection.

The output format is 'tar'.  This makes it very easy for the end
user to examine the resulting dataset, e.g. for purpose of extracting
files for debug purposes; as well as making it easy to contemplate
adding things like a direct gzip stage to the data pipeline during
backup/restore.  It also makes it convenient to construct and maintain
synthetic backup datasets for testing purposes.

Within the tar format, certain artificial conventions are used.
All files are stored within top-level directories according to
their semantic origin:

apps/pkgname/a/  : Application .apk file itself
apps/pkgname/obb/: The application's associated .obb containers
apps/pkgname/f/  : The subtree rooted at the getFilesDir() location
apps/pkgname/db/ : The subtree rooted at the getDatabasePath() parent
apps/pkgname/sp/ : The subtree rooted at the getSharedPrefsFile() parent
apps/pkgname/r/  : Files stored relative to the root of the app's file tree
apps/pkgname/c/  : Reserved for the app's getCacheDir() tree; not stored.

For each package, the first entry in the tar stream is a file called
"_manifest", nominally rooted at apps/pkgname.  This file contains some
metadata about the package whose data is stored in the archive.

The contents of shared storage can optionally be included in the tar
stream. It is placed in the synthetic location:

shared/...

uid/gid are ignored; app uids are assigned at install time, and the
app's data is handled from within its own execution environment, so
will automatically have the app's correct uid.

Forward-locked .apk files are never backed up.  System-partition
.apk files are not backed up unless they have been overridden by a
post-factory upgrade, in which case the current .apk *is* backed up --
i.e. the .apk that matches the on-disk data.  The manifest preceding
each application's portion of the tar stream provides version numbers
and signature blocks for version checking, as well as an indication
of whether the restore logic should expect to install the .apk before
extracting the data.

System packages can designate their own full backup agents.  This is
to manage things like the settings provider which (a) cannot be shut
down on the fly in order to do a clean snapshot of their file trees,
and (b) manage data that is not only irrelevant but actively hostile
to non-identical devices -- CDMA telephony settings would seriously
mess up a GSM device if emplaced there blind, for example.

When a full backup or restore is initiated from adb, the system will
present a confirmation UI that the user must explicitly respond to
within a short [~ 30 seconds] timeout.  This is to avoid the
possibility of malicious desktop-side software secretly grabbing a copy
of all the user's data for nefarious purposes.

(*) The backup is not strictly a full mirror.  In particular, the
    settings database is not cloned; it is handled the same way that
    it is in cloud backup/restore.  This is because some settings
    are actively destructive if cloned onto a different (or
    especially a different-model) device: telephony settings and
    AndroidID are good examples of this.

(**) On the framework side it doesn't care that it's adb; it just
    sends the tar stream to a file descriptor.  This can easily be
    retargeted around whatever transport we might decide to use
    in the future.

KNOWN ISSUES:

* the security UI is desperately ugly; no proper designs have yet
  been done for it
* restore is not yet implemented
* shared storage backup is not yet implemented
* symlinks aren't yet handled, though some infrastructure for
  dealing with them has been put in place.

Change-Id: Ia8347611e23b398af36ea22c36dff0a276b1ce91
2011-05-10 17:52:51 -07:00
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
Jake Hamby
ee60f3fb1b resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
2011-05-10 15:52:15 -07:00
John Reck
2b3fcfb4cf Add ROOT_ID to Accounts column
Change-Id: I4c3bbe90a91971085252b54d162c771fbb4b7711
2011-05-10 14:07:18 -07:00
Eric Fischer
ca43ef6bc7 am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'affca8fa11aa731cdc8b4b4f2b5478f182b9fbbf':
  Import revised translations.  DO NOT MERGE
2011-05-10 12:26:09 -07:00
Eric Fischer
affca8fa11 am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'f3bd663c67fe3aa3e8ec728e90f19e3fa50c3fbd':
  Import revised translations.  DO NOT MERGE
2011-05-10 12:21:32 -07:00
Eric Fischer
f3bd663c67 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-10 12:18:21 -07:00
Joe Onorato
0fe56853fd am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
* commit '37c077d3dc32cd42c145072b671a6d53563b0156':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
2011-05-10 12:03:55 -07:00
Joe Onorato
37c077d3dc am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
* commit '81faa44c48911e4a63adaa1c92c5a40ea3c58ffb':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
2011-05-10 12:01:40 -07:00
Joe Onorato
81faa44c48 Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 2011-05-10 11:59:42 -07:00
Joe Onorato
5f9f7ff4b7 Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up
on large tablets.

Change-Id: I42d810a5b8e61b2959e30abef91477152495d39f
2011-05-10 11:58:22 -07:00
Robert Greenwalt
441bc9a6f4 am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
  Fix the adding of host routes.
2011-05-10 11:53:57 -07:00
Robert Greenwalt
f43396caaa Fix the adding of host routes.
We used to just add

Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
2011-05-10 11:27:46 -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
Eric Fischer
47f6e8f2a7 Import revised translations. DO NOT MERGE
Change-Id: I017caa112d687f53c1c3e65bb4bac71c25bf3b6f
2011-05-09 16:51: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