summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "More compatibility mode improvements." into honeycomb-mr2Dianne Hackborn2011-05-2411-108/+172
|\
| * More compatibility mode improvements.Dianne Hackborn2011-05-2411-108/+172
| | | | | | | | | | | | | | | | | | We now correctly adjust display metrics, fixing for example issues seen in Barcode Scanner. In addition the decision about when to use compatibility mode has a bug fixed where certain apps would not go out of compatibility mode even though they should be able to. Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
* | Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain ↵Kristian Monsen2011-05-243-14/+20
|\ \ | | | | | | | | | doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2
| * | Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't ↵Kristian Monsen2011-05-243-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bypass proxy DO NOT MERGE This is the WebView part, passing the bypass list to the native side. Moved some code to JWebCoreJavaBridge.java because because sendStaticMessage only takes one argument. Needs CL in external/webkit: https://android-git.corp.google.com/g/#change,111108 Needs following CL in external/chromium: https://android-git.corp.google.com/g/#change,111107 Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
* | | Merge "Update the Desktop UA to Chrome" into honeycomb-mr2John Reck2011-05-241-4/+3
|\ \ \ | |_|/ |/| |
| * | Update the Desktop UA to ChromeJohn Reck2011-05-231-4/+3
| | | | | | | | | | | | | | | | | | Bug: 4347787 Change-Id: I5117c7dbd4e73c39ed417113f12b517de5411e81
* | | Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet ↵Amith Yamasani2011-05-232-16/+10
|\ \ \ | | | | | | | | | | | | screens." into honeycomb-mr2
| * | | DO NOT MERGE. Preference activity changes to work on smaller tablet screens.Amith Yamasani2011-05-232-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breadcrumbs move to the action bar on certain configs. Padding around fragments and to the left of preference items adjusted for different display sizes. Change-Id: Ie899f9742f4ebd7044f158b1c7db06df82ad2d75
* | | | Merge "MountService: Add StorageVolume as extra in storage related ↵Mike Lockwood2011-05-231-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | broadcasts." into honeycomb-mr2
| * | | MountService: Add StorageVolume as extra in storage related broadcasts.Mike Lockwood2011-05-231-0/+5
| | |/ | |/| | | | | | | | | | Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "DO NOT MERGE Use previous version if version is a codename" into ↵John Reck2011-05-231-2/+11
|\ \ \ | | | | | | | | | | | | honeycomb-mr2
| * | | DO NOT MERGE Use previous version if version is a codenameJohn Reck2011-05-231-2/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | When the version is reported as a codename, use the previous version in the user agent string. Bug: 4347787 Change-Id: I4ed804a7334d6ca242446176ff042c4ac7938a0f
* | | Merge "Add "television" mode." into honeycomb-mr2Dianne Hackborn2011-05-232-1/+4
|\ \ \
| * | | Add "television" mode.Dianne Hackborn2011-05-232-1/+4
| | | | | | | | | | | | | | | | Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
* | | | Simplify browser pause/resume logic to avoid stuck timer.Shimeng (Simon) Wang2011-05-231-5/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current browser pause/resume logic uses an integer count to track the pause/resume behavior, which is mostly working fine in phone. The interger count is usually 0 when browser is paused, and its value is usually 1 when the browser is resumed and will trigger any delayed timer. But in tablet, where tabs can be easily created/switched/deleted, this logic will not work well and sometimes cause resources timers get stuck. For example, in case multiple tabs are created, and you reload one of the tabs, when it's almost finished, switch to another tab, and hit home or power button, at this point of time, the browser will be suspended at Controller.java::onPause, hence the integer count will be 0; but since the other tab is also finished after the pause, the current logic at Controller.java::onPageFinished will call pause timer again, which will make the integer count to be -1. Before the time the browser is resumed, it's very possible some tabs will have some resources, such as images/flashs, scheduled to be loaded, these will be in delayed timer in ResourceLoadScheduler.cpp's m_requestTimer. Now when the browser is resumed, the integer count will be 0, which will not trigger delayed timer. Then all the new timers will be stuck as well since old timers are not executed yet. The fix is to simplify the pause/resume logic by just using a boolean variable instead of error-prone integer counting. issue: 4177932 Change-Id: Id10af9298c7be1f82222d0b94c34c5dc68403630
* | | Merge "Change measurement of effective screen height for PopupWindow now ↵Adam Powell2011-05-201-2/+1
|\ \ \ | |/ / |/| | | | | that DisplayMetrics reports it without system decorations." into honeycomb-mr2
| * | Change measurement of effective screen height for PopupWindow now thatAdam Powell2011-05-201-2/+1
| |/ | | | | | | | | | | DisplayMetrics reports it without system decorations. Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
* | Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2Dianne Hackborn2011-05-201-10/+46
|\ \ | |/ |/|
| * Add ParcelFileDescriptor.fromFd() and .adoptFd().Dianne Hackborn2011-05-201-10/+46
| | | | | | | | Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
* | Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2Adam Powell2011-05-201-5/+18
|\ \
| * | New opaque cab assets; search dialog tweaks.Adam Powell2011-05-191-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New opaque assets (now actually opaque!) * SearchDialog determines theme to use from parent context * SearchDialog now disallows action modes Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
* | | Do not merge. Backport two fixes for InputMethethodFrameworksatok2011-05-201-7/+4
| |/ |/| | | | | | | | | | | | | | | Bug: 3420384 backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4 backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942 Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
* | Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-196-57/+116
|/ | | | Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
* Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2Adam Powell2011-05-191-0/+17
|\
| * DO NOT MERGE Action bar config changesAdam Powell2011-05-191-0/+17
| | | | | | | | | | | | | | Handle action bar padding on configuration changes when the app handles these changes itself. Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
* | Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into ↵Chet Haase2011-05-192-3/+41
|\ \ | |/ |/| | | honeycomb-mr2
| * DO NOT MERGE: Add custom fragment anims for popping backstackChet Haase2011-05-192-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fragment implementation allowed for animations during fragment transitions, but did not account for the different behavior of fragments when popping the back stack. In general, you probably don't want to run the same animation for putting a fragment on the stack as for popping it off, which is what happens now. For example, you might fade a fragment out when putting it on the stack. But when popping ot off, fading it out is probably not the behavior you want. The new API (setCustomAnimations() overload with two additional parameters) allows developers to specify animations to be run in the popping operation. Otherwise, the animations are null and the operation will not be animated. Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
* | USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-191-0/+12
|/ | | | | Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Fix bug 4416126 - orientation change bug with action bar overflow menuAdam Powell2011-05-171-3/+1
| | | | Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
* StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-3/+36
| | | | | | | This ID is used for MTP as well as per volume querying in the media provider. Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b Signed-off-by: Mike Lockwood <lockwood@android.com>
* Prevent cases of bogus action bar measurement.Adam Powell2011-05-172-15/+16
| | | | Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
* Merge "DO NOT MERGE Use action bar overflow menus on large configurations as ↵Adam Powell2011-05-171-3/+2
|\ | | | | | | well as xlarge." into honeycomb-mr2
| * DO NOT MERGE Use action bar overflow menus on large configurations asAdam Powell2011-05-161-3/+2
| | | | | | | | | | | | | | | | well as xlarge. ICS will have a more intelligent way of determining this. Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
* | Add new command line option to change global screen size.Dianne Hackborn2011-05-161-0/+3
| | | | | | | | | | | | | | | | For example: adb shell am display-size 1024x600 Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
* | Merge "DO NOT MERGE. From main -- Start work on simulating ↵Dianne Hackborn2011-05-162-3/+29
|\ \ | | | | | | | | | landscape/portrait when orientation is locked." into honeycomb-mr2
| * | DO NOT MERGE. From main -- Start work on simulating landscape/portrait when ↵Dianne Hackborn2011-05-162-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation is locked. Not yet working, so turned off. Also fix a bug where the display size configuration became inconsistent after a configuration change -- we now figure out everything about the display size when computing a new configuration. Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
* | | Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to ↵Dianne Hackborn2011-05-162-2/+8
|\ \ \ | |/ / | | | | | | use for an orientation." into honeycomb-mr2
| * | DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for ↵Dianne Hackborn2011-05-162-2/+8
| | | | | | | | | | | | | | | | | | an orientation. Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
* | | Merge "DO NOT MERGE. Integrate from master: Rework display size access." ↵Dianne Hackborn2011-05-168-39/+115
|\ \ \ | |/ / | | | | | | into honeycomb-mr2
| * | DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-168-39/+115
| | | | | | | | | | | | | | | | | | | | | | | | Applications now get the display size from the window manager. No behavior should be changed yet, this is just prep for some real changes. Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
* | | Merge "StorageManager: Clean up and generalize storage configuration ↵Mike Lockwood2011-05-165-29/+223
|\ \ \ | |/ / |/| | | | | resources" into honeycomb-mr2
| * | StorageManager: Clean up and generalize storage configuration resourcesMike Lockwood2011-05-165-29/+223
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Replace config_emulateExternalStorage, config_externalStorageRemovable, config_externalStoragePaths, config_externalStorageDescriptions and config_mtpReserveSpaceMegabytes resources with an XML resource file to describe the external storages that are available. Add android.os.storage.StorageVolume class StorageManager.getVolumeList() now returns an array of StorageVolume Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.Dianne Hackborn2011-05-137-88/+184
|/ | | | | | | | | Activity manager now does all dump requests into apps asynchronously, so it can nicely timeout if there is an app problem. Also lots of general cleanup of the am dump output. Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
* DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.Dianne Hackborn2011-05-138-12/+132
| | | | | | And clean up some documentation. Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
* Merge "Fix a bug where an action bar could be created when it should not ↵Dianne Hackborn2011-05-131-0/+5
|\ | | | | | | be." into honeycomb-mr2
| * Fix a bug where an action bar could be created when it should not be.Adam Powell2011-05-131-0/+5
| | | | | | | | Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
* | DO NOT MERGE. Integrate fragment work from masterDianne Hackborn2011-05-135-35/+178
|/ | | | | | | | | | | | | | | | | | | | | Back-port new fragment detach APIs from support lib. This allow a much cleaner implementation of things like the fragment pager class. Integrate from support lib: fix restore of list state. The FragmentManager/ListFragment impl was restoring the list state before setting its adapter. This caused the list view to lose the state, since it gets cleared as part of setting the adapter. Now the fragment manager waits on restoring the view hierarchy state until after it has done onActivityCreated(), at which point we have set the adapter. It would be nice to make list view less fragile in this regard, but that is for a different change. Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
* DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-125-5/+102
| | | | | | | | | | | | | | | | 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
* MR2 is going to be API 13.Dianne Hackborn2011-05-121-1/+6
| | | | Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
* Fix build.Dianne Hackborn2011-05-121-0/+3
| | | | Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
generated by cgit v1.1 at 2025-01-29 01:54:30 +0000