Commit Graph

32563 Commits

Author SHA1 Message Date
Jake Hamby
49b2ebe8b3 resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
2011-05-10 15:52:15 -07:00
Eric Fischer
eb03b6a1f4 am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '98041f02b471b100056c3dc16e50f04a059f9a58':
  Import revised translations.  DO NOT MERGE
2011-05-10 14:27:23 -07:00
Eric Fischer
60490cc70a am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '270fbfede58e4971588755adfa7e70e0de07b8cf':
  Import revised translations.  DO NOT MERGE
2011-05-10 14:23:46 -07:00
Eric Fischer
bfa17d2e4a am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '372592032a0e552ca30faadac9be823bd397910b':
  Import revised translations.  DO NOT MERGE
2011-05-10 14:21:08 -07:00
Eric Fischer
228a3092a5 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-05-10 14:18:10 -07:00
Eric Fischer
48a4ba5779 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
04de9afdc5 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
e320ebe0ff Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-10 12:18:21 -07:00
Joe Onorato
1a32a0db38 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
a5c5ef11bb 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
817262a8d9 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
Robert Greenwalt
10bfd9d59a 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
9ae2705075 Merge "Fix the adding of host routes." into honeycomb-LTE 2011-05-10 11:51:36 -07:00
Dianne Hackborn
a1f89099d8 am 652dbb7d: am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2
* commit '652dbb7dca84ee3b350225cb38824fe3773af42b':
  Fix scaling of batched motion events.
2011-05-10 11:15:39 -07:00
Dianne Hackborn
edd292f8ce am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2
* commit '837bdc4919aedfea8c0ba492d964eb921d4e302d':
  Fix scaling of batched motion events.
2011-05-10 11:01:50 -07:00
Dianne Hackborn
9467d6c805 Merge "Fix scaling of batched motion events." into honeycomb-mr2 2011-05-10 10:58:44 -07:00
Dirk Dougherty
aec65a327e am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit 'e4e8dffd41c0f7aaf005418b71cae7738ad868d2':
  Doc change: add Android 3.1 highlights and version notes.
2011-05-10 00:46:26 -07:00
Scott Main
8fcfae410e am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen fil
* commit '6b2c8f00c95d05a8ca410ff74451fd0701f36119':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
2011-05-10 00:46:21 -07:00
Dirk Dougherty
a14345a16e am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '0d5196b972044da44a844acd9cdffde9d5aa696d':
  Doc change: add Android 3.1 highlights and version notes.
2011-05-10 00:37:02 -07:00
Scott Main
c60dbd0f3c am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and ad
* commit 'fef7b62506a74d0133b60fd1d6ae9bf54bf599c9':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
2011-05-10 00:36:59 -07:00
Dirk Dougherty
296d68f8aa am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '5f8f0a0d40675bc4d373121ffdd22730f3701662':
  Doc change: add Android 3.1 highlights and version notes.
2011-05-10 00:34:09 -07:00
Scott Main
bdc375c34f am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen supp
* commit '7f3cf449fe1b90b902a37ddc3c05ec7aa236e584':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
2011-05-10 00:34:06 -07:00
Dirk Dougherty
7220d3cca5 Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 2011-05-09 22:58:37 -07:00
Wink Saville
f6a24584f0 am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE
* commit 'eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc':
  Fix issue on infinite retry config in RetryManager
2011-05-09 20:34:24 -07:00
Wink Saville
fd3883f0ad am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE
* commit 'd237bcb241b2be8b2f3f3baed87fce973de00fa7':
  Add unset and setOnIccRefresh.
2011-05-09 20:32:34 -07:00
Wink Saville
0248bcfec4 Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE 2011-05-09 20:31:45 -07:00
Wink Saville
e7f811d83e Merge "Add unset and setOnIccRefresh." into honeycomb-LTE 2011-05-09 20:29:55 -07:00
Scott Main
1a384cde95 Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5" into honeycomb-mr1 2011-05-09 18:32:10 -07:00
Dianne Hackborn
d97f6b4ef9 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
79cdb88298 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
aafc700511 Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2 2011-05-09 17:06:24 -07:00
Dianne Hackborn
16fe3c2c1f 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
Wink Saville
ae58e5aec4 am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
* commit '45364dc4bfe3e6118ad61f1d38489fe63418699a':
  Telephony: Signal Strength Changes.
2011-05-09 17:02:07 -07:00
Robert Greenwalt
4060c0e96d am a142512a: Broadcast SIM Refresh to all registered components
* commit 'a142512a5009d7b4c422d23b1d7bab8d219eb50b':
  Broadcast SIM Refresh to all registered components
2011-05-09 16:58:52 -07:00
Wink Saville
6d6482cb0a Merge "Telephony: Signal Strength Changes." into honeycomb-LTE 2011-05-09 16:57:32 -07:00
Robert Ly
fe40b2273a am 5d032390: am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit '5d03239063d0c5148d920a0992da8974c6e0a8ce':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
2011-05-09 14:47:43 -07:00
Robert Ly
6ce71e363d am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit '279442428ab1000b57273f172453b712b03cb9fd':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
2011-05-09 14:43:28 -07:00
Robert Ly
dab2072130 am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit 'c3038308a765de2826997b65c175bf752b45bc70':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
2011-05-09 14:41:00 -07:00
Robert Ly
93f4ccf24b Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 2011-05-09 14:25:53 -07:00
The Android Automerger
a8e0709c6d 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
The Android Automerger
1d09b2b69a Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:38:02 -07:00
The Android Automerger
5451520bd5 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 2011-05-08 22:11:52 -07:00
Scott Main
8679a1bbb6 am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
* commit '5de8226cc7caea7a52d9f2538f87d2cc34214ad0':
  docs: update sdk tools sums and sizes based on candidate 5
2011-05-06 17:25:38 -07:00
Scott Main
88b4a6cbf6 am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
* commit '5cf78ecd2c523be442f52888ca613b9a92325a6c':
  docs: update sdk tools sums and sizes based on candidate 5
2011-05-06 17:22:34 -07:00
Scott Main
3d102050c3 am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard
* commit '71a73dab704df2c536bbd4c16454cdcdc472fce2':
  docs: update screens dashboard and add opengl dashboard
2011-05-06 17:08:06 -07:00
Scott Main
efa8aef94c am b6451228: docs: update screens dashboard and add opengl dashboard
* commit 'b6451228526288b158c3b0bf0c5abbd5b072d51c':
  docs: update screens dashboard and add opengl dashboard
2011-05-06 17:05:42 -07:00
Robert Greenwalt
46cf1db334 am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
  Fix 2 functions getting connections up by apnType
2011-05-06 16:25:39 -07:00
Robert Greenwalt
e4c1b85e7f Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE 2011-05-06 16:21:06 -07:00
Robert Greenwalt
e5dba76ed8 am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE
* commit '2499da83cb3db5f1d87a52e3e390139c98ff4210':
  Mark a disable apn so we don't reconnect.
2011-05-06 14:57:08 -07:00
Robert Greenwalt
0630fc5e75 Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTE 2011-05-06 14:52:45 -07:00