summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 81faa44c: Merge "Move / copy some framework and systemui resources from ↵Joe Onorato2011-05-10128-0/+91
|\ | | | | | | | | | | | | 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.
| * Merge "Move / copy some framework and systemui resources from xlarge to ↵Joe Onorato2011-05-10128-0/+91
| |\ | | | | | | | | | large. The status bar now comes up on large tablets." into honeycomb-mr2
| | * Move / copy some framework and systemui resources from xlarge to large. The ↵Joe Onorato2011-05-10128-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | status bar now comes up on large tablets. Change-Id: I42d810a5b8e61b2959e30abef91477152495d39f
* | | Merge "Fix the adding of host routes." into honeycomb-LTERobert Greenwalt2011-05-103-28/+132
|\ \ \
| * | | Fix the adding of host routes.Robert Greenwalt2011-05-103-28/+132
| | | | | | | | | | | | | | | | | | | | | | | | We used to just add Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
* | | | am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2Dianne Hackborn2011-05-101-0/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '837bdc4919aedfea8c0ba492d964eb921d4e302d': Fix scaling of batched motion events.
| * | | Merge "Fix scaling of batched motion events." into honeycomb-mr2Dianne Hackborn2011-05-101-0/+8
| |\ \ \
| | * | | Fix scaling of batched motion events.Dianne Hackborn2011-05-091-0/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I1e070c936f7b2e8f1bb7ebae62b1df0aa6998b82
* | | | | am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and ↵Dirk Dougherty2011-05-1013-20/+1850
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-1013-20/+1850
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0913-20/+1850
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1
| | | * | | | Doc change: add Android 3.1 highlights and version notes.Dirk Dougherty2011-05-0913-20/+1850
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbc7df004d8aca9073d6397fad282a57ad4f1b74
* | | | | | | am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to ↵Scott Main2011-05-1014-1247/+1129
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1014-1247/+1129
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | 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-0914-1247/+1129
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | docs: update screen support doc to de-emphasize support for 1.5Scott Main2011-05-0614-1247/+1129
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 For more change history, also see Change-Id: Iadebc9ca3f2f5a0e7490466811f0d741fe2b2b8c Change-Id: I78825116f5f7825da42120e840e5bc6d8d1e359c
* | | | | | Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTEWink Saville2011-05-093-28/+48
|\ \ \ \ \ \
| * | | | | | Fix issue on infinite retry config in RetryManagerKazuhiro Ondo2011-05-093-28/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "infinite retry config is lost when "resetRetryCount" is called. Change-Id: I2b737efa6092ad1254c8dc25840ec429f5c6e882
* | | | | | | Merge "Add unset and setOnIccRefresh." into honeycomb-LTEWink Saville2011-05-092-0/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add unset and setOnIccRefresh.Wink Saville2011-05-092-0/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A temporary hack as some binaries are using these methods. Change-Id: I4ee63df82acf167ab5f434e63bd073e84e1fdf71
* | | | | | am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." ↵Dianne Hackborn2011-05-0931-451/+891
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | 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-0931-451/+891
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Better compat mode part one: start scaling windows.Dianne Hackborn2011-05-0931-451/+891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Telephony: Signal Strength Changes." into honeycomb-LTEWink Saville2011-05-091-13/+21
|\ \ \ \ \
| * | | | | Telephony: Signal Strength Changes.Ramesh Sudini2011-05-091-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia406d21d860533e699a90d15130edcbc705ec645
* | | | | | Broadcast SIM Refresh to all registered componentsRobert Greenwalt2011-05-095-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There could be multiple registrants like SIM, STK. Port of 6228 from partner repo. Change-Id: I0756d8b69e30058409e0279f65a99a1aa091e13d
* | | | | | am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to ↵Robert Ly2011-05-092-0/+764
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-0/+764
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | | | | | | | | | | 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-092-0/+764
| | |\ \ \ | | | |_|/ | | |/| | | | | | | link when we get the package" into honeycomb-mr1
| | | * | Doc change: adding ADK doc. still need to add the adk pkg download link when ↵Robert Ly2011-05-092-0/+764
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we get the package Change-Id: I941e708a70b48dba2da4aa3d186824c89ebfb22f
* | | | | Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-082-2/+6
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2The Android Automerger2011-05-0826-134/+1613
| |\ \ \ | | |/ /
| * | | DO NOT MERGE Handle GET_POWER failuresIrfan Sheriff2011-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a failure when GET_POWER returns a non-conforming format Bug: 4380317 Change-Id: Ie723c424ab07774f2be2594aa5deeaa5cd5ac280
| * | | DO NOT MERGE: Don't send pause again when coming back from full screenTeng-Hui Zhu2011-05-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we enter full screen, the inline video has been paused. When we re-play in the inline mode, we don't need to paused the previous video, which is the full screen one. bug:4259109 Change-Id: I577edf43563116b0d1a9266d741e6a8aabbca779
| * | | DO NOT MERGE MediaScanner: Add special casing of WMP album art files to ↵Mike Lockwood2011-05-031-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isNoMediaPath() This will prevent MediaProvider from adding these files to the images table Change-Id: Ibc4128762f221b370a00e331aca633aafae0ad70 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't let the "no media" status of one directory leak to the remaining files and directories in the same parent. Bug: 4364077 Change-Id: Ie756ccd06b1962b06143fc02a1a3927c3aba143a Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-037-2/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the PC to access thumbnails in JPEG files over MTP/PTP Bug: 3219495 Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-036-38/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MTP does not support partial writes of files (the entire file must be transferred at once). This makes it impossible to implement a FUSE file system for MTP with acceptable performance. To fix this problem, this change adds extended MTP operations to allow partial writes to files: SendPartialObject - allows writing a subset of a file, or appending to the end of a file TruncateObject - allows changing the size of a file BeginEditObject - must be called before using SendPartialObject and TruncateObject EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject We also add GetPartialObject64, which is the same as GetPartialObject but has a 64 bit offset rather than 32. Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding ↵Mike Lockwood2011-05-035-124/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files from the media provider Previously we ignored any files and directories that had name started with '.' and ignored any directories that contained a ".nomedia" file. Now to support transferring any file via MTP, we now add these previously ignored files to the media database, but will not mark them as audio, video, image or playlist files. That way they will be included in the files table but will be hidden from the audio, video, images and playlist views that are used by apps like Music and Gallery. Bug: 3405327 Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-031-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file was originally considered a video file (because it had a .mp4 extension, for example), but was then discovered to have only an audio track, it would update the type, but not the URI for insertion into the media provider. Change-Id: I25652a031b98d2ec2433263dd6f344ba90d2d112 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"Mike Lockwood2011-05-032-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to allow MTP to access secondary external storage devices This reverts commit 35a2ea2fbf156a503d1b0bc6ca7784e51e2462f4. Conflicts: data/etc/platform.xml Change-Id: I0b139a0f3b369c1080831a5b3a48f5d9a330b1bb Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-0311-104/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - MTP support for multiple storage units - Add storage_id column to media database for MTP storage ID - Add framework resource for defining mount points and user visible descriptions for multiple volumes - Clean up locking in MtpServer JNI code Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MountService: Fix running media scanner at boot.Mike Lockwood2011-05-031-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I67ff2ccde7e03143167b8c59726ffb741c96e028 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE Fix deadlock in MountServiceMike Lockwood2011-05-031-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not safe to call into vold with a lock held on mVolumeStates since we will receive events back from vold on a different thread. So in the boot completed handler we make a copy of the volume list and then call vold to mount volumes after releasing the lock Change-Id: Ic9836c2e1e8a5677d0c4e33476a72081f69823a0 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-033-0/+68
| | | | | | | | | | | | | | | | | | | | Change-Id: I43d5c1730b340f1288b58012234b38f801001b71 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | DO NOT MERGE MountService: Add support for multiple volumesMike Lockwood2011-05-031-108/+111
| | | | | | | | | | | | | | | | | | | | Change-Id: I45ee0e5735a6d72c635f6d22320e8b13bccc3847 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5Scott Main2011-05-061-12/+12
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '5cf78ecd2c523be442f52888ca613b9a92325a6c': docs: update sdk tools sums and sizes based on candidate 5
| * | | docs: update sdk tools sums and sizesScott Main2011-05-061-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | based on candidate 5 Change-Id: I10929c0dfd889c919d70a4aaa4854ce1fecbc51d
* | | | am b6451228: docs: update screens dashboard and add opengl dashboardScott Main2011-05-063-24/+126
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b6451228526288b158c3b0bf0c5abbd5b072d51c': docs: update screens dashboard and add opengl dashboard