summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge changes I21e9629e,I535ed3baDaniel Sandler2011-05-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Create an XML config flag to turn the navbar off. It's lights out for you, navigation bar!
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Leave the number of output buffers up to surface flinger and friends."Andreas Huber2011-05-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make sure the ogg extractor returns appropriate error codes."Andreas Huber2011-05-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "add more logging into DRT"Guang Zhu2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Remove an unnecessary word from javadoc"Daisuke Miyakawa2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add code for generating fifo command packing."Jason Sams2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Use canonical paths to compare library directory with data directory."Amith Yamasani2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Properly honour any pending seek request when reading the first ↵Andreas Huber2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | buffer after"
* | | | | | | | | | | | | | | | | | | am 63c5a2bc: am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add ↵Dirk Dougherty2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 3.1 highlights and version notes." into honeycomb-mr1 * commit '63c5a2bc39839804442ba2800b6d974d0391f2cc': Doc change: add Android 3.1 highlights and version notes.
| * | | | | | | | | | | | | | | | | | am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 ↵Dirk Dougherty2011-05-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | highlights and version notes." into honeycomb-mr1 * commit 'e4e8dffd41c0f7aaf005418b71cae7738ad868d2': Doc change: add Android 3.1 highlights and version notes.
| | * | | | | | | | | | | | | | | | | am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and ↵Dirk Dougherty2011-05-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version notes." into honeycomb-mr1 * commit '0d5196b972044da44a844acd9cdffde9d5aa696d': Doc change: add Android 3.1 highlights and version notes.
| | | * | | | | | | | | | | | | | | | am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version ↵Dirk Dougherty2011-05-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes." into honeycomb-mr1 * commit '5f8f0a0d40675bc4d373121ffdd22730f3701662': Doc change: add Android 3.1 highlights and version notes.
| | | | * | | | | | | | | | | | | | | Merge "Doc change: add Android 3.1 highlights and version notes." into ↵Dirk Dougherty2011-05-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1
* | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 315595d1: am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update ↵Scott Main2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 enab * commit '315595d10dfd4b8fe32cfe45a53f9e342bf0a699': 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
| * | | | | | | | | | | | | | | | | | | am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen support ↵Scott Main2011-05-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | | | am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to ↵Scott Main2011-05-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | | | am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support ↵Scott Main2011-05-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | | | | | | | | | | | | | Merge "docs: update screen support doc to de-emphasize support for 1.5 this ↵Scott Main2011-05-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | am d649887a: am eb8da0fe: Merge "Fix issue on infinite retry config in ↵Wink Saville2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RetryManager" into honeycomb-LTE * commit 'd649887a43efb435f1ea2255c364d8c214552aef': Fix issue on infinite retry config in RetryManager
| * | | | | | | | | | | | | | | | | | am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into ↵Wink Saville2011-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc': Fix issue on infinite retry config in RetryManager
| | * | | | | | | | | | | | | | | | | Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTEWink Saville2011-05-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d1736a3d: am d237bcb2: Merge "Add unset and setOnIccRefresh." into ↵Wink Saville2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'd1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c': Add unset and setOnIccRefresh.
| * | | | | | | | | | | | | | | | | | | am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTEWink Saville2011-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd237bcb241b2be8b2f3f3baed87fce973de00fa7': Add unset and setOnIccRefresh.
| | * | | | | | | | | | | | | | | | | | Merge "Add unset and setOnIccRefresh." into honeycomb-LTEWink Saville2011-05-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | / / / / / / / / / | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 05be6d6f to master"Dianne Hackborn2011-05-102-24/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 05be6d6f to masterDianne Hackborn2011-05-092-24/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212
| | * | | | | | | | | | | | | | | | | | am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling ↵Dianne Hackborn2011-05-092-24/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows." into honeycomb-mr2 * commit '4907d1d5e2c7d244b07579b8c52153df69754e85': Better compat mode part one: start scaling windows.
| | | * | | | | | | | | | | | | | | | | am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." ↵Dianne Hackborn2011-05-092-24/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '0c6cbf410a642f6e9cea7cca0a6e53a4a3cdd324': Better compat mode part one: start scaling windows.
| | | | * | | | | | | | | | | | | | | Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2Dianne Hackborn2011-05-092-24/+25
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Better compat mode part one: start scaling windows.Dianne Hackborn2011-05-092-24/+25
| | | | | | |_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | Merge "Deprecating webkit API's that might not be supported in the future"Kristian Monsen2011-05-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Add unset and setOnIccRefresh."Wink Saville2011-05-100-0/+0
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Add send session recording summary report to application"James Dong2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am ba54feb0: am 45364dc4: Merge "Telephony: Signal Strength Changes." into ↵Wink Saville2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'ba54feb094fdf0eb2201eae5751104a144a2a31d': Telephony: Signal Strength Changes.
| * | | | | | | | | | | | | | | am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTEWink Saville2011-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45364dc4bfe3e6118ad61f1d38489fe63418699a': Telephony: Signal Strength Changes.
| | * | | | | | | | | | | | | | Merge "Telephony: Signal Strength Changes." into honeycomb-LTEWink Saville2011-05-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | am b98b56c2: am a142512a: Broadcast SIM Refresh to all registered componentsRobert Greenwalt2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b98b56c21faac16cea97e8cdcba485365f86c50f': Broadcast SIM Refresh to all registered components
| * | | | | | | | | | | | | | | am a142512a: Broadcast SIM Refresh to all registered componentsRobert Greenwalt2011-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a142512a5009d7b4c422d23b1d7bab8d219eb50b': Broadcast SIM Refresh to all registered components
* | | | | | | | | | | | | | | | am a3838018: am 5d032390: am 27944242: am c3038308: Merge "Doc change: ↵Robert Ly2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1 * commit 'a38380183329912a9d79a84ad5265c6c9dbef434': Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
| * | | | | | | | | | | | | | | am 5d032390: am 27944242: am c3038308: Merge "Doc change: adding ADK doc. ↵Robert Ly2011-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to ↵Robert Ly2011-05-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk ↵Robert Ly2011-05-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | / / / / / / / / / / | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | | | | | | | | | Merge "Doc change: adding ADK doc. still need to add the adk pkg download ↵Robert Ly2011-05-090-0/+0
| | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link when we get the package" into honeycomb-mr1
* | | | | | | | | | | | | | Merge "Fix mode."Marco Nelissen2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "When using O_CREAT, the mode should be specified."Marco Nelissen2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | / / / / / / | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge "Refactor MPEG4Writer::writeTrackHeader() method"James Dong2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch ↵The Android Automerger2011-05-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'goog/honeycomb-mr2\' into honeycomb-LTE * commit 'bdaa3abdf264372f337cfa9236e53b1e3cfde525': 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
| * | | | | | | | | | | | am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | | | | | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | / / / / / / / | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2The Android Automerger2011-05-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |