kmccormick
127809334c
am 90bdbe8c: am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
...
* commit '90bdbe8c999df88330b28daa492eeb4425863dab':
Doc update: new reg error code + snippet
2014-11-13 22:34:03 +00:00
kmccormick
90bdbe8c99
am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
...
* commit '30aee7fccbbcbdd09ca9393636316813e222ba62':
Doc update: new reg error code + snippet
2014-11-13 22:29:45 +00:00
kmccormick
30aee7fccb
am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
...
* commit 'feb1347b2b411be03c640e8d61bfc3b428932e31':
Doc update: new reg error code + snippet
2014-11-13 22:24:44 +00:00
kmccormick
feb1347b2b
Merge "Doc update: new reg error code + snippet" into lmp-docs
2014-11-13 22:21:03 +00:00
Jeff Sharkey
628d2606f7
Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev
2014-11-13 22:16:15 +00:00
Abhijith Shastry
fb8db1c84b
Merge "new sms/mms carrier app API" into lmp-mr1-dev
2014-11-13 22:15:46 +00:00
Jeff Sharkey
3b566b8470
Move ringtone redirection to MediaPlayer.
...
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.
With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.
To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.
Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
2014-11-13 13:52:41 -08:00
Geoff Mendal
a81b1cad2b
am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '4cc7bbc9fd937c6f25962fd6971e77773114aff2':
Import translations. DO NOT MERGE
2014-11-13 20:58:23 +00:00
Jeff Brown
cb906677fc
am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
...
* commit '24c1d664c4f95a8c997bfc4683844e05b788c3db':
Remove an unnecessary condition from previous change.
2014-11-13 20:58:19 +00:00
Jeff Brown
72f1e3b9c9
am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '1cbff0e310b0fba6b25ca1c1e14eaefeabdee0d9':
Improve screen brightness boost behavior.
2014-11-13 20:58:15 +00:00
Renato Mangini
7e582533f3
am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page.
...
* commit 'ee291ca2ce4092aaae556ebda46daf7337506f74':
Add new samples to what's new page.
2014-11-13 20:58:03 +00:00
John Spurlock
338bc5a418
Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
2014-11-13 20:20:25 +00:00
Jeff Sharkey
51151dcc94
Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev
2014-11-13 20:17:32 +00:00
Jeff Sharkey
13cf7917af
Make package verifier broadcasts foreground.
...
We're using ordered broadcasts (sigh!) for package verification, and
we could be stuck behind dozens of other background broadcasts, so
hoist into foreground queue.
Bug: 18356768
Change-Id: Ib4abf771db0147f8fbd7227f32297602816c84ae
2014-11-13 12:14:30 -08:00
Simranjit Singh Kohli
fdcdb7429e
Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
2014-11-13 19:18:30 +00:00
Wale Ogunwale
28d3c245a1
Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
2014-11-13 19:00:07 +00:00
Jean-Michel Trivi
136f54153e
Merge "Support for delayed audio focus" into lmp-mr1-dev
2014-11-13 18:47:34 +00:00
Adam Powell
87bc2acfd3
Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
2014-11-13 18:12:54 +00:00
RoboErik
f338fcbae5
Merge "Use the suggested stream if it's currently active" into lmp-mr1-dev
2014-11-13 17:55:06 +00:00
Mike Lockwood
eb205b8819
Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev
2014-11-13 17:52:02 +00:00
Mike Lockwood
9c803fa526
MTP: Update JNI for new packet getters
...
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
2014-11-13 09:40:42 -08:00
Jorim Jaggi
a77a37c48a
Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev
2014-11-13 17:02:18 +00:00
Jorim Jaggi
048af1f727
Fix doze jank by removing a fullscreen layer of overdraw
...
Move all doze related stuff into DozeScrimController, and combine
both alpha values from the regular ScrimController and
DozeScrimController before applying it to a view. Move the black
background from NotificationPanelView to DozeScrimController, which
saves a fullscreen layer of overdraw during the transition.
Bug: 18238168
Change-Id: Ifb133bf4a0f8255f5c2f5e205509af339cac8c8f
2014-11-13 17:54:21 +01:00
Jorim Jaggi
d0d23c80da
Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev
2014-11-13 16:46:57 +00:00
Craig Mautner
30bd3bb77b
Revert "Debug for bug 18017409"
...
The bug has been fixed. No longer needed.
This reverts commit 5a3c231dc8 .
Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
2014-11-13 08:45:39 -08:00
Jorim Jaggi
68b83a784a
Fix wrong states when waking up from doze via touch
...
Bug: 18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
2014-11-13 17:09:29 +01:00
John Spurlock
25c3421c5e
Zen: Update condition text for current condition.
...
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.
Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).
Also, clear the fired-alarm cache on time or time-zone resets.
Bug: 16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
2014-11-13 11:03:10 -05:00
Alexandra Gherghina
c61cabe5b3
Merge "Update current.txt with the new extra" into lmp-mr1-dev
2014-11-13 15:31:11 +00:00
Ignacio Solla
bf79cbaba9
Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
2014-11-13 15:03:45 +00:00
Alexandra Gherghina
a73766790a
Update current.txt with the new extra
...
Bug: 17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
2014-11-13 14:43:03 +00:00
Alexandra Gherghina
6e33f0fbb5
Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895
Add extra for account migration in the DevicePolicyMamager
...
This is in preparation for the implementation CL
Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
2014-11-13 12:46:16 +00:00
Geoff Mendal
f030e66f9d
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-13 09:43:51 +00:00
Geoff Mendal
4cc7bbc9fd
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-11-13 09:41:29 +00:00
Narayan Kamath
eed1fba6b5
Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
2014-11-13 09:33:12 +00:00
Geoff Mendal
0df377c7a6
Import translations. DO NOT MERGE
...
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
2014-11-12 23:20:52 -08:00
Jeff Brown
fef1e0e7f0
Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
2014-11-13 07:11:37 +00:00
Jeff Brown
24c1d664c4
Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
2014-11-13 07:04:54 +00:00
Jeff Brown
a191aa99ab
Remove an unnecessary condition from previous change.
...
Change-Id: Ib966fbb373294ad60caf7f1d9cbb7fafd05ded6b
2014-11-12 23:01:12 -08:00
Jeff Brown
1cbff0e310
Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
2014-11-13 06:58:03 +00:00
Geoff Mendal
f26e4ce8b2
Import translations. DO NOT MERGE
...
Change-Id: I2b1c0b5c7530c8733d15551bb11211fa3e5585df
Auto-generated-cl: translation import
2014-11-12 21:07:02 -08:00
Renato Mangini
ee291ca2ce
am 6f41522d: am c9fc837f: Add new samples to what\'s new page.
...
* commit '6f41522d6847afa5bb7ce1cff2a64ec7e9f18ecf':
Add new samples to what's new page.
2014-11-13 04:05:00 +00:00
Renato Mangini
6f41522d68
am c9fc837f: Add new samples to what\'s new page.
...
* commit 'c9fc837fb3d866484a8ed3e61f2ba551f76af66b':
Add new samples to what's new page.
2014-11-13 03:54:11 +00:00
Renato Mangini
c9fc837fb3
Add new samples to what's new page.
...
Also reverted the order on the page to show most recent samples first.
Bug: 18323953
Change-Id: I79b01fa71547f4a7d843f52bdd1853dd8fbe54a8
2014-11-12 18:55:06 -08:00
Jeff Brown
7b5be5e2a7
Improve screen brightness boost behavior.
...
Wake-up when entering brightness boost mode, don't boost in ambient
mode since some display device drivers do strange things in that mode and
boost doesn't work. Waking up feels more natural as well.
Don't flutter the power HAL's interactive mode bit simply due to changes
in display ready state since that may result in visible artifacts
such as display flashes.
Don't stop the auto-brightness sensor while temporarily boosted.
Don't prevent the display from entering the ready state while in brightness
boost since that would unnecessarily delay the transition from DOZING to AWAKE
until boost is finished.
Restart the user activity timeout when brightness boost ends and prevent
the display from dimming while boosted.
The pixel fairies basked in the sunlight.
Bug: 18262044
Bug: 18261782
Change-Id: I8c42a1e6091b0fe1253e90265ac248087ebc24e1
2014-11-12 18:49:36 -08:00
Andrew Lee
990bbbb352
Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev
2014-11-13 02:15:15 +00:00
Yorke Lee
5e783896a2
Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev
2014-11-13 00:50:02 +00:00
xinhe
031d8feaa9
Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev
2014-11-13 00:38:00 +00:00
Adam Lesinski
db3d76ab68
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev
2014-11-13 00:33:00 +00:00
Chris Craik
075b2b4ff9
Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev
2014-11-13 00:05:59 +00:00