summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE Sanity check loaded periodics and cap runtime.Matthew Williams2015-10-164-11/+78
| | | | | | | | | | | BUG: 24900376 We've seen an issue where periodic run times can be massively inflated after loading from disk. As a safeguard, cap the period's loaded runtime to be [p, 2p] from the time of loading. Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6 (cherry picked from commit fa8e5084eed63ab8d92c71fcff656690a30293c3)
* Merge "Fix line height problem with inline images in StaticLayout." into ↵Roozbeh Pournader2015-10-161-2/+4
|\ | | | | | | mnc-dr-dev
| * Fix line height problem with inline images in StaticLayout.Roozbeh Pournader2015-10-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, paragraphs with ImageSpans in their middle would continue to carry the height of the image into the line height of next lines. This was a regression from L. The bug was due to StaticLayout's out() method almost always modifying the value of its parameter "fm", although that was only intended when there were LineHeightSpans in the text. The method generate() was assuming that it can restore fmTop etc to metrics of the current span by setting them from "fm" after out() was run, while "fm" was modified by out() and its original values was lost! The fix makes sure to set chooseHt back to null if there were no LineHeightSpans, so out() would not modify "fm" unless necessary. AOSP bug: https://code.google.com/p/android/issues/detail?id=188042 Bug: 24548073 Change-Id: I0d00af384c35a9d863377972318da9db7668118f
* | Merge "Fix wrongly laid out navigation color view" into mnc-dr-devAdrian Roos2015-10-161-9/+9
|\ \
| * | Fix wrongly laid out navigation color viewAdrian Roos2015-10-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SystemUI visibility listener in DecorView gets called between the measure and layout passes and is therefore not allowed to change layout parameters. This change makes sure that changes to the color view layout parameters are applied eagerly when the insets change instead of waiting for the views to become visible. Bug: 24614374 Change-Id: If9df18f582163d0869c28a852c36697b1ce50621
* | | Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-devJulia Reynolds2015-10-166-151/+117
|\ \ \
| * | | Add 'until next alarm' option to QS zen panel.Julia Reynolds2015-10-156-151/+117
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the implementation in LMR1, this is a countdown condition (a countdown until the time of what was the next alarm when the rule was created). The rule will not change if alarms change. Also, alarms up to 7 days in the future will be considered. Bug: 21648799 Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb (cherry picked from commit 0842fe87b27b9e4a7aecfec25b93dba2d39f398a)
* | | Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into ↵Matthew Williams2015-10-161-2/+2
|\ \ \ | | | | | | | | | | | | mnc-dr-dev
| * | | DO NOT MERGE Change scheduling logic to run network jobs soonerMatthew Williams2015-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 24385082 BUG: 23144425 BUG: 18117279 Run jobs with connectivity constraints as soon as the developer-allotted delay has expired, rather than waiting for the override deadline. This is more in tune with what developers expect, although it reduces the amount of batching the scheduler can theoretically do. This will also have the side effect of fixing several failing cts tests that started breaking b/c the signal to 'run connectivity jobs early' was removed in M and nothing was put in to replace it. Change-Id: I7e63c2b62f2882ee906f748445bbf10c32e19c5f (cherry picked from commit aa9843198dec910a581bdc509d3937a9ea6ceca9)
* | | | Merge "Fix ChooserTarget app scoring" into mnc-dr-devAdam Powell2015-10-161-1/+1
|\ \ \ \
| * | | | Fix ChooserTarget app scoringAdam Powell2015-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An initial sorting step before applying modifiers to the ChooserTarget scores provided by apps was backwards, causing subsequent target scores to be heavily penalized. Targets are then heavily influenced by the lowest score in the set relative to the targets from other apps. Bug 25013559 Change-Id: I39d5d7c601712fc6a19e694d5846d2c8d17a214f
* | | | | Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." ↵Tyler Gunn2015-10-161-3/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mnc-dr-dev
| * | | | DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.Roshan Pius2015-10-161-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a new carrier config key to specify the gap between the DTMF tones sent out to the network. Setting it to 100ms by default. This is based on a similar set of changes for IMS calls: ag/747865. BUG: 19118840 Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
* | | | | Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into ↵Abodunrinwa Toki2015-10-162-6/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | DO NOT MERGE: Reduce delay of floating toolbar appearance.Abodunrinwa Toki2015-10-162-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21956394 Change-Id: I3db39e84afd3474b5bb53522c5a4c738ec1511bf
* | | | | | Merge "Update docs to reflect adoptable behavior." into mnc-dr-devJeff Sharkey2015-10-162-261/+392
|\ \ \ \ \ \
| * | | | | | Update docs to reflect adoptable behavior.Jeff Sharkey2015-10-142-261/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update storage related docs on Context to be consistent, and to call out relevant Environment methods. Start calling it "shared" storage, and only mention external for historical reasons. Mention that there isn't much benefit to using emulated storage over private data directories to help guide developers to safer locations. Point out which paths can change over time, so developers know to only persist relative paths. Update Environment docs to reflect how they behave for the new class of adopted storage devices. Bug: 24251945 Change-Id: Ie5ab337649b4740dfd7594997bbb19c4969cfd2f
* | | | | | | Merge "Disassociate system windows from apps" into mnc-dr-devWale Ogunwale2015-10-161-8/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Disassociate system windows from appstiger_huang2015-10-161-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the original logic, if an app creates a system window, when the user goes to home screen, the system window will be still there and become unable to receive input events, because the system window will be also changed to the stopped state with the app window, and the current logic of ViewRootImpl forbid a stopped window receiving input events. This change prevents assigning the token of the app window to system windows created by the app, so that when the app goes to the stopped state, its system windows won't be affected (can still receive input events). This change is related to the following changes: https://android.googlesource.com/platform/frameworks/base/+/a5d29971f8f4d463348e9de0f7af7e2e92a377a0 https://android.googlesource.com/platform/frameworks/base/+/15ed2754a308546a54ab1061b4e365d6fe9b898d https://android.googlesource.com/platform/frameworks/base/+/c3672cd3f7e2bd87d6de9dada499de82b62fae84 https://android.googlesource.com/platform/frameworks/base/+/41725dedc33906aaafee36b2d6523596e2a8a52e Bug: 24967303 Bug: https://code.google.com/p/android/issues/detail?id=189710 Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
* | | | | | | Merge "Mask IccId which gets printed in bug reports & radio logs." into ↵Sanket Padawe2015-10-161-1/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | mnc-dr-dev
| * | | | | | Mask IccId which gets printed in bug reports & radio logs.Sanket Padawe2015-10-151-1/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 24941148 Change-Id: Ibe397f5d9b0da245e3e64f626937db4792c7f3c2
* | | | | | Merge "Fix issue #24571425: Device does not come out of idle mode for ↵Dianne Hackborn2015-10-151-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | maintenance" into mnc-dr-dev
| * | | | | | Fix issue #24571425: Device does not come out of idle mode for maintenanceDianne Hackborn2015-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow alarms to push the idle maintenance alarm later than it was set for. Change-Id: I947718ffc9d2b984a793d7e4f2d027d8ddeee41b
* | | | | | | Don't project ripple for adequately tall spinnersAlan Viverette2015-10-151-5/+5
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 24674907 Change-Id: I1674c14f321600a40ca20adab1d40459963d2d1b
* | | | | | Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-devRob Carr2015-10-151-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | WindowStateAnimation: Clear transformation clip rect.Robert Carr2015-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the clip rect taken from transformations is cleared when there is no transformation. Normally the failure to clear the clip would not cause a problem, as the final clip would be equal to the window size. However, in the event that the window scale goes on to change (WindowState::m(H/V)Scale that is) the clip will now be specified at the inappropriate scale (notice the way the clip must be divided by H/VScale as SurfaceFlinger will apply the surface transform to the clip). Bug:24298694 Change-Id: I4548e8ecea8d66d4942e99823653a7b05f87cea0 (cherry picked from commit 2f0fe62c5426533ccdf9ec7ef28027c367286979)
* | | | | | Merge "Update volume slider on device changed." into mnc-dr-devJulia Reynolds2015-10-151-7/+16
|\ \ \ \ \ \
| * | | | | | Update volume slider on device changed.Julia Reynolds2015-10-141-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24501085 Change-Id: I5bd0ac014eb291cafcf918e8a73a30e95245d533
* | | | | | | Merge "Selectively show zen footer." into mnc-dr-devJulia Reynolds2015-10-151-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Selectively show zen footer.Julia Reynolds2015-10-141-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show zen footer if the active stream is affected by the current zen mode. Bug: 23844466 Change-Id: I08770882f12f11c3458e1e48a287139480ae7aa3 (cherry picked from commit 6aa83b4ca0859c3f59413ef092f8d843f8646f0e)
* | | | | | | Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-devChris Thornton2015-10-151-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Don't call StopRecognition when recognition was aborted.Chris Thornton2015-10-071-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If recognition has been aborted, then the call to the sound trigger device stop recognition has already occurred. The sound trigger helper would then try to stop it again, which generates an error code for a stop without a corresponding start event. BUG=24677430 Change-Id: Ibf5d1da1a8eb06b677e428f047905d15fd5cf21f
* | | | | | | | am e34445f1: Merge "Docs only change: update build version docs." into mnc-devDianne Hackborn2015-10-151-4/+30
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'e34445f11a6a14dd30ba0e018b82e852ef82ecbc': Docs only change: update build version docs.
| * | | | | | | Merge "Docs only change: update build version docs." into mnc-devDianne Hackborn2015-10-151-4/+30
| |\ \ \ \ \ \ \
| | * | | | | | | Docs only change: update build version docs.Dianne Hackborn2015-09-241-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30f55549394693ea04cd390b1ae66347ae212123
* | | | | | | | | am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into ↵Adrian Roos2015-10-157-3/+75
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '31f19c444f5f9d22c81fcb339e51bee465ba10f9': Send next alarm's show intent via PendingIntent
| * | | | | | | | Merge "Send next alarm's show intent via PendingIntent" into mnc-devAdrian Roos2015-10-157-3/+75
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Send next alarm's show intent via PendingIntentAdrian Roos2015-09-157-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also send all IntentTile intents via PendingIntent. Bug: 23909438 Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
* | | | | | | | | Merge "Load binary hyphen data files" into mnc-dr-devRoozbeh Pournader2015-10-153-15/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Load binary hyphen data filesRaph Levien2015-10-143-15/+38
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for loading the pre-compiled binary format for hyphenation patterns. Bug: 21562869 Bug: 21826930 Bug: 24570591 Change-Id: Iaeaa9c9ac9dac236af6b0d7894c2e2396bc8447d (cherry picked from commit 091dba2de1e5fa7d4db9f8ccbf1f86e5825d0f52)
* | | | | | | | | Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-devAdam Powell2015-10-141-7/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bugs introduced in ChooserActivityAdam Powell2015-10-141-7/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wait to start animations until all state has been initialized, as the process of starting an Animator will set initial values, triggering other events relying on the configured state. * Correctly track underlying item indexes for columns. * Do not over-extend the ResolverDrawerLayout when multiple rows animate in. Bug 24926885 Bug 24928706 Change-Id: I4772e1a0ba79b17b5dc19c778f3ef0cb5200c533
* | | | | | | | | Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-devAmit Mahajan2015-10-141-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding config to allow/disallow user to add APNs.Amit Mahajan2015-10-121-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24519879 Bug: 24681288 Change-Id: I7f9b54e56a5e7f20b156609c560480440241ede8
* | | | | | | | | | Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 ↵Vineeta Srivastava2015-10-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bar" into mnc-dr-dev
| * | | | | | | | | | TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 barSungmin Choi2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24850563 Change-Id: I36e54e9bde9610f908b1092e11c476dcae76526d Signed-off-by: haesun.kim <haesun.kim@lge.com> Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
* | | | | | | | | | | Merge "Make Hyphenator#get() return an object." into mnc-dr-devRoozbeh Pournader2015-10-142-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make Hyphenator#get() return an object.Roozbeh Pournader2015-10-142-6/+11
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, a native pointer was returned. After this change, callers should call getNativePtr() if they want to get the native pointer instead. Bug: 21492297 Bug: 24570591 Change-Id: I745bd88e6e8c86078fffb07f90f8d8f24215410c (cherry picked from commit e7eac6f540b09892172edd5b584605ea90f5a1ba)
* | | | | | | | | | | Merge "Ensure we update the active pointer id on pointer up/down." into ↵Winson Chung2015-10-141-0/+22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | | | | | | Ensure we update the active pointer id on pointer up/down.Winson2015-10-121-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24841350 Change-Id: Id5d91ee8adbb638caf66976d701cfbc0befaca04
generated by cgit v1.1 at 2025-02-10 21:50:31 +0000