Commit Graph

32220 Commits

Author SHA1 Message Date
Wink Saville
079aa0daf8 Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE 2011-05-15 14:38:59 -07:00
Robert Greenwalt
22f76d0082 Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE 2011-05-15 07:53:50 -07:00
Wink Saville
97f87eb6a8 Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE 2011-05-14 07:35:21 -07:00
Scott Main
6c344c7803 am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '084d3490a5283088426058d3c15532b176367926':
  docs: update homepage I/O announcement
2011-05-13 20:32:32 -07:00
Scott Main
3fce43da30 am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
  docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00
Scott Main
ebbc478d9b Merge "docs: update homepage I/O announcement" into honeycomb-mr1 2011-05-13 20:26:56 -07:00
Dianne Hackborn
923d3e4e36 am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
  DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
Xavier Ducrohet
a20e479072 am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '738c5e6072459c772064c96233cf59639bbfe2fd':
  LayoutLib: implement data binding for most AdapterView
2011-05-13 16:32:47 -07:00
Xavier Ducrohet
0c36d14f6b am 2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
  LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
Dianne Hackborn
e50994f021 am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
  Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:26:44 -07:00
Dianne Hackborn
bd2fecd927 Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 2011-05-13 16:24:32 -07:00
Dianne Hackborn
d26eaf683d am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
  DO NOT MERGE.  Integrate fragment work from master
2011-05-13 15:36:48 -07:00
Dianne Hackborn
a15868e6cb Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 2011-05-13 15:33:21 -07:00
Jeff Brown
b7341bf80c am 4fb76253: Fix bounds check. Bug: 4413945
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
  Fix bounds check. Bug: 4413945
2011-05-13 13:04:28 -07:00
Dianne Hackborn
ed49d546d1 am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
2011-05-13 11:18:40 -07:00
Dianne Hackborn
29a781c814 Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 2011-05-13 11:16:42 -07:00
Scott Main
fcfe82e63f am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:00:27 -07:00
Scott Main
6145b9defc am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
* commit 'd32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:58:29 -07:00
Scott Main
74c4d84a19 am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 10:56:52 -07:00
Scott Main
9fed145eb4 am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:55:09 -07:00
Scott Main
f87d9feac1 Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 2011-05-13 10:54:00 -07:00
Wink Saville
b6a14cb262 Merge "Add getLteOnCdamMode." into honeycomb-LTE 2011-05-13 09:09:43 -07:00
Dianne Hackborn
88c0d696cc DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
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