Dianne Hackborn
dfce045584
am a8138732: MR2 is going to be API 13.
...
* commit 'a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.
2011-05-12 17:35:35 -07:00
Dianne Hackborn
8fbbfe5bac
am df9799f0: Fix build.
...
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
Fix build.
2011-05-12 17:35:20 -07:00
Irfan Sheriff
a4bb9e57a5
Merge commit '01ea7f01' into manualmerge1
2011-05-12 17:19:56 -07:00
Irfan Sheriff
cc13621e36
Merge commit '09564fbb' into manualmerge
2011-05-12 15:47:28 -07:00
Teng-Hui Zhu
b9c36527f1
am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
...
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
Fix the Uri parsing issue
2011-05-12 15:01:56 -07:00
Dianne Hackborn
aef4c4a98f
am 0f1de9ad: New compat mode front end: UI and persistence.
...
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
New compat mode front end: UI and persistence.
2011-05-12 15:01:53 -07:00
Irfan Sheriff
a51147adb4
Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2
2011-05-12 14:18:03 -07:00
Irfan Sheriff
a4ae316ca4
Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2
2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
4755b0da13
Merge "Fix the Uri parsing issue" into honeycomb-mr2
2011-05-12 14:11:25 -07:00
Wink Saville
adfda25efe
Merge "Fix initialization of RouteInfo" into honeycomb-LTE
2011-05-12 13:26:44 -07:00
Robert Ly
ffee8c9dee
am f3cdea93: am a45e4f4d: doc change: adding link to pic board
...
* commit 'f3cdea937b8b659f959d5e77f4a17f749f85c6ae':
doc change: adding link to pic board
2011-05-11 09:08:42 -07:00
Robert Ly
6b9a781755
am a45e4f4d: doc change: adding link to pic board
...
* commit 'a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
doc change: adding link to pic board
2011-05-11 09:04:52 -07:00
Wink Saville
3448749e67
Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
2011-05-10 16:28:33 -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
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
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
9ae2705075
Merge "Fix the adding of host routes." into honeycomb-LTE
2011-05-10 11:51:36 -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
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
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
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
6d6482cb0a
Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
2011-05-09 16:57:32 -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
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
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
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
e4c1b85e7f
Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
2011-05-06 16:21:06 -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
Scott Main
ddfdd61b38
am 223a94d2: docs: de-new the dev guide toc
...
* commit '223a94d2effd0ba9ef205d0bb790a5bdfb4d54c0':
docs: de-new the dev guide toc
2011-05-06 10:05:56 -07:00
Scott Main
35927d110f
am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
...
* commit '9f7054fea28e65ae1bf8bc1114090306979ba657':
docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 08:41:57 -07:00
Scott Main
f17cb2110c
Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
2011-05-06 08:31:40 -07:00
Scott Main
68328dcefc
am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
...
* commit 'f88b52fbf693d8b17e57a9d2fdda5a29e1bfa8d9':
docs: version notes for tools 11
2011-05-05 18:34:42 -07:00
Scott Main
4a30e130f6
Merge "docs: version notes for tools 11" into honeycomb-mr1
2011-05-05 18:32:42 -07:00
Scott Main
be32882b54
am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
...
* commit '46524f83a55731cd96c9df8a87be6dacb1db1a37':
docs: add package description for RTP
2011-05-05 18:00:57 -07:00