summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Reset the Experimental WebView property per build" into klp-devJonathan Dixon2013-08-221-7/+16
|\
| * Reset the Experimental WebView property per buildJonathan Dixon2013-08-211-7/+16
| | | | | | | | | | | | | | | | In order to increase test coverage, reset to the default value everytime the build ID changes. Bug: 10427705 Change-Id: I75e301d26ee0ca52265c5f7fe48661787b596168
* | Merge "Remove newly added but deprecated master switch location setting ↵David Christie2013-08-221-36/+0
|\ \ | | | | | | | | | methods." into klp-dev
| * | Remove newly added but deprecated master switch location setting methods.David Christie2013-08-211-36/+0
| |/ | | | | | | Change-Id: I5e85a1efafe45cee89e08b97a0dcb016c91fd572
* | Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug ↵Romain Guy2013-08-222-3/+23
|\ \ | | | | | | | | | #10347089" into klp-dev
| * | Second attempt at avoiding infinite loop in PathCache::trim()Romain Guy2013-08-212-3/+23
| | | | | | | | | | | | | | | | | | Bug #10347089 Change-Id: I70f5a3933e848632473acc6636c88be5dc6ac430
* | | Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-devEino-Ville Talvala2013-08-221-2/+2
|\ \ \
| * | | Camera1: Rename setPreviewTexture to ...Target for clarityEino-Ville Talvala2013-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 10312644 Change-Id: I4bee90428cb932a12d73dad89e91bb2ef492dc86
* | | | Merge "Properly account for created paths in the cache" into klp-devRomain Guy2013-08-222-1/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Properly account for created paths in the cacheRomain Guy2013-08-212-1/+6
| | | | | | | | | | | | | | | | Change-Id: I47b89b3085cefab6daac9194e7bfd3c140b37fa2
* | | | Merge "The VM handles blocking SIGPIPE." into klp-devElliott Hughes2013-08-211-15/+0
|\ \ \ \
| * | | | The VM handles blocking SIGPIPE.Elliott Hughes2013-08-211-15/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need this any more. Bug: 10211309 (cherry picked from commit 437e76208d451e7954699ead8931d0fe147bb07d) Change-Id: I97b3ab4f65a70eacca2fbe95cfb11b1cc85c4021
* | | | Fix VALUE_RINGTONE_SILENT ref.Sam Blitzstein2013-08-211-4/+4
|/ / / | | | | | | | | | Change-Id: I115c8d2e0e972f6d7d732071d26ae5f489b926f3 (cherry picked from commit 044ffbbbaa7dc07c2aa40a35d5d13b1b3e7bd0c0)
* | | Extend AlarmClock API (just slightly)Sam Blitzstein2013-08-212-27/+197
| | | | | | | | | | | | | | | | | | | | | Add some extras to SET_ALARM action. Add SET_TIMER action. Change-Id: I436864ca875a7eb1c424d0d21882d624780d6ff1 (cherry picked from commit fe7dedefe9c146209f73306dbd1584f251f85d1c)
* | | Merge "Cancel running LayoutTransition before removing it from a container" ↵Chet Haase2013-08-211-0/+5
|\ \ \ | | | | | | | | | | | | into klp-dev
| * | | Cancel running LayoutTransition before removing it from a containerChet Haase2013-08-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, setting a new LayoutTransition object on a container would not do anything to the old transition object (if it existed). This means that the previous transition could be mid-flight, changing stuff in that container, and would continue doing so even after it was removed. This could cause artifacts like that in the bug below where views that are fading out would be put in the containers "disappearing children" list for the duration of the fade... and then would never be removed from that list because the container was no longer connected to that transition. This caused items to stay visible even after they were removed from their parent containers. Issue #10119571 LayoutTransitions sometimes does not honor view's visibility Change-Id: I3efa4065e47fa97c4dd90410bbc1a0273c2b8079
* | | | Merge "Move caption view from Settings into framework" into klp-devAlan Viverette2013-08-213-0/+382
|\ \ \ \
| * | | | Move caption view from Settings into frameworkAlan Viverette2013-08-213-0/+382
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Renamed to SubtitleView, moved dimensions into resources. BUG: 10260603 Change-Id: I5d86ee21ca260540ba3201c5295a5c1353e2d963
* | | | Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." ↵Mathieu Chartier2013-08-211-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | into klp-dev
| * | | Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".Mathieu Chartier2013-08-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10131789 Change-Id: Ib9962f7becdedd71f48123a4720dcce1d09abb9d
* | | | Merge "Camera2: cleanup unused imports" into klp-devZhijun He2013-08-212-6/+0
|\ \ \ \
| * | | | Camera2: cleanup unused importsZhijun He2013-08-212-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: I067a29ac43e7d70f07f45463bee46a8f6d3f31a5
* | | | | Merge "Add overdraw debugging that accounts for Deuteranomaly" into klp-devRomain Guy2013-08-214-9/+52
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add overdraw debugging that accounts for DeuteranomalyRomain Guy2013-08-214-9/+52
| | | | | | | | | | | | | | | | | | | | Change-Id: I31f68a07aa7cf0490d2572e24e4c5ac2066a1151
* | | | | Merge "Camera2: Update tonemap curve definitions." into klp-devZhijun He2013-08-213-16/+56
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Camera2: Update tonemap curve definitions.Zhijun He2013-08-213-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates android.tonemap.curveGreen and android.tonemap.curveBlue definitions. Also update android.sensor.info.physicalSize type. Bug: 10394966 Change-Id: I23156ad0cd67fa59500a1c803068e392514756d4
* | | | | Camera2: Fix build: add temperature entry to camera public APIEino-Ville Talvala2013-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2722b80a38e0c844611f34e85697735982bf1fa0
* | | | | Merge "Camera2: Convert camera device errors to exceptions" into klp-devEino-Ville Talvala2013-08-211-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera2: Convert camera device errors to exceptionsEino-Ville Talvala2013-08-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: I1752cecf55269c2c9f22962660c0b3fc236138fa
* | | | | Merge "Move forwarding code to ListPopupWindow, add drag-to-open in Spinner" ↵Alan Viverette2013-08-215-170/+208
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into klp-dev
| * | | | | Move forwarding code to ListPopupWindow, add drag-to-open in SpinnerAlan Viverette2013-08-165-170/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 9437139 Change-Id: I4599cf65a472b2ce74d2301988359d87917a6eec
* | | | | | Merge "Use MULTI_LINE and OPENS_POPUP accessibility properties" into klp-devAlan Viverette2013-08-215-0/+33
|\ \ \ \ \ \
| * | | | | | Use MULTI_LINE and OPENS_POPUP accessibility propertiesAlan Viverette2013-08-195-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 10391326 Change-Id: Ib2deeeef401802b6dde646e14ee5367141469a58
* | | | | | | Merge "camera2: add sensor.temperature optional key. clear up some metadata ↵Igor Murashkin2013-08-212-5/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | definitions" into klp-dev
| * | | | | | | camera2: add sensor.temperature optional key. clear up some metadata definitionsIgor Murashkin2013-08-202-5/+69
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I1fabdf383b303ea52d73a055b83a0c4a1bca3f95
* | | | | | | Merge "Protect a bunch of broadcast intents" into klp-devMatthew Xie2013-08-211-0/+27
|\ \ \ \ \ \ \
| * | | | | | | Protect a bunch of broadcast intentsMatthew Xie2013-08-201-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the changed intents are restricted. Only Bluetooth Process can broadcast/send them. bug 7622253 Change-Id: I098664bf266ac44b7904f8f79b1804d5130f5cd5
* | | | | | | | Merge "Notify IP address changes to interface observers." into klp-devLorenzo Colitti2013-08-214-0/+92
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Notify IP address changes to interface observers.Lorenzo Colitti2013-08-204-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add addressUpdated and addressRemoved methods to INetworkManagementEventObserver. (The -Updated method is not called -Added because it gets called for both adds and changes.) Update all its callers in the tree. 2. Make NetworkManagementService parse IP address notifications from NetlinkHandler and call the address{Removed,Updated} on its observers. Bug: 10232006 Change-Id: Ieb185dbba052bdbff03caafc0cf5397a7f04dc6d
* | | | | | | | Merge "Updating Force Use toggling for Communication use case" into klp-devEric Laurent2013-08-211-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Updating Force Use toggling for Communication use caseJohan Gustavsson2013-08-211-2/+16
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setForceUse toggling is shaky when toggling either through setSpeakerphoneOn and setBluetoothScoOn. Depending on call sequence an application may unintentionally trigger a routing use case it does not want. The main root cause is that neither of these calls take the previous state into account. A call to setSpeakerPhoneOn will for example partly disable any active BT SCO routing. Change-Id: I436ee5a8da2d9ea5a2e4e89eec083c8118a5ff7e
* | | | | | | | Merge "Add xxhdpi drawables" into klp-devAdam Powell2013-08-21713-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Add xxhdpi drawablesAdam Powell2013-08-21713-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I16d27db7fc6a01710c4e6bde5d0e0d7cf3a14aba
* | | | | | | | | Merge "Switch QuickSettings to new LocationMode setting api." into klp-devDavid Christie2013-08-211-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Switch QuickSettings to new LocationMode setting api.David Christie2013-08-201-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3981741ae422562e9c703b76d10278f285739c6
* | | | | | | | | Merge "Add inPremutiplied option to BitmapFactory.Options, functionality in ↵Chris Craik2013-08-2116-139/+296
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitmap" into klp-dev
| * | | | | | | | | Add inPremutiplied option to BitmapFactory.Options, functionality in BitmapChris Craik2013-08-2016-139/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:2248948 Change-Id: I8fdd649332667598504a1076d5a447572bd53086
* | | | | | | | | | Merge "Make BaseNetworkObserver available to core code" into klp-devLorenzo Colitti2013-08-213-15/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Make BaseNetworkObserver available to core codeLorenzo Colitti2013-08-203-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently BaseNetworkObserver is in frameworks/base/services, but there is code in frameworks/base/core that could use it. This code typically extends INetworkManagementEventObserver.stub because BaseNetworkObserver is not available. Move BaseNetworkObserver to frameworks/base/core without changing its package name, and use it to simplify two callers. The third caller, Tethering, is much larger, and I'm not sure it's appropriate to change it. Bug: 10232006 Change-Id: Ifc0f2e619e3424e27e35730c048a1cc523df345e
* | | | | | | | | | Merge "Modify LinkProperties address update methods." into klp-devLorenzo Colitti2013-08-213-22/+105
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /