Chris Wren
af098c5657
Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
2014-09-30 18:50:05 +00:00
Paul Jensen
8df099df15
Make CaptivePortalLogin app exit if underlying Network disconnects.
...
The app is no longer useful if the underlying Network has disconnected
and could get in the way of another signing into another Network.
bug:17672087
Change-Id: I26e820444640975e7fd4dd73244f4d4f4b40cb5e
2014-09-30 14:34:04 -04:00
Alexandra Gherghina
75c33d9d04
Merge "Adds the ability to start a user in background" into lmp-dev
2014-09-30 17:00:14 +00:00
Dianne Hackborn
c3014c8cf8
Merge "Fix issue #17705755 : Battery stats resets at incorrect times" into lmp-dev
2014-09-30 16:45:26 +00:00
Winson Chung
e3206407a5
Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev
2014-09-30 16:39:43 +00:00
John Spurlock
a1b84165f9
Merge "Don't play hint animations when dozing" into lmp-dev
2014-09-30 16:35:26 +00:00
Chris Wren
e6c4893ed4
Update the documentation on EXTRA_PEOPLE.
...
Include the supported formats with links to ContactsContract documentation.
Bug: 15283556
Change-Id: Ic48b0a9ad1be61f0fa119b1d0e9d6aac5e5bea27
2014-09-30 11:57:03 -04:00
Jorim Jaggi
d7912d2f10
Don't play hint animations when dozing
...
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab
Merge "Pull roaming from mServiceState for consistency" into lmp-dev
2014-09-30 15:30:11 +00:00
George Mount
8afceda141
Merge "Clear preordered list after use." into lmp-dev
2014-09-30 14:58:21 +00:00
John Spurlock
ee98df79a1
Doze: Log screenOnFromTouch when flinging.
...
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4
Pull roaming from mServiceState for consistency
...
Also consolidate roaming logic while here, to make it easier to
maintain.
Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
2014-09-30 10:05:46 -04:00
Matthew Williams
bc156ba430
Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
2014-09-30 03:09:10 +00:00
Lorenzo Colitti
d8f7e04828
Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
2014-09-30 03:05:49 +00:00
Dianne Hackborn
fb3809ca63
Fix issue #17705755 : Battery stats resets at incorrect times
...
Revert back to (mostly) KK behavior, fix a problem where we were
collecting some data in an inconsistent state.
Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02
2014-09-29 18:31:22 -07:00
Scott Rowe
d1462247e0
am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '6287a65cca1d7efb8a265be5b51feca0f1e320f7':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 00:53:34 +00:00
Ricardo Cervera
3910b5d2f5
am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '6ea34ddfde0aa3c60a83cc4fb7111514be97da9c':
docs: Fixed path for build output.
2014-09-30 00:53:23 +00:00
Justin Koh
91bd876991
am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '92ffd6b5fe11c649483c1ae53ec72a42d33629dd':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-09-30 00:53:19 +00:00
Alan Viverette
76e15c4b3a
Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev
2014-09-30 00:50:39 +00:00
Alan Viverette
b6ca2050c3
Decrease date picker height to avoid cutting off calendar
...
BUG: 17696098
Change-Id: I3d97d8bcd5222bf266dfc75e89759d57ec184515
2014-09-29 17:47:03 -07:00
Scott Rowe
6287a65cca
am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '294d534787e139119d30eb7a5b4dd1532312018e':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-30 00:39:49 +00:00
Ricardo Cervera
6ea34ddfde
am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '9f48394158bce2984a19fe504b7a7f1f673866f3':
docs: Fixed path for build output.
2014-09-30 00:39:39 +00:00
Justin Koh
92ffd6b5fe
am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-09-30 00:39:16 +00:00
Alan Viverette
b805da9b59
Merge "Fix drawable container tinting" into lmp-dev
2014-09-30 00:32:30 +00:00
Alan Viverette
bddb843e79
Fix drawable container tinting
...
BUG: 17704311
Change-Id: Ib9ced41e8589352c852e6c9dc7abbe6e4b9f2520
2014-09-29 17:22:47 -07:00
Jean-Michel Trivi
4a154af9aa
Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
2014-09-30 00:11:14 +00:00
George Mount
50ac6cb982
Clear preordered list after use.
...
Bug 17671834
Bug 17697944
Change-Id: I0ba46f32661869db0c925b00342211ea543e2f88
2014-09-29 17:10:24 -07:00
Dianne Hackborn
38646c19d8
Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
2014-09-29 23:06:17 +00:00
Dianne Hackborn
73d6a821ae
Work on issue #17656716 : Unhandled exception in Window Manager
...
Remove the checks for large parcel sizes. Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.
Add logging for strict mode IPCs, since those seem to be the
problem. Only log when things look bad.
Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.
Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
2014-09-29 16:04:02 -07:00
Scott Rowe
294d534787
am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-09-29 22:53:15 +00:00
Chris Craik
e910cc8838
Merge "Implement alpha as documented for drawables" into lmp-dev
2014-09-29 22:20:43 +00:00
Scott Rowe
9d20628b4b
docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
2014-09-29 15:11:46 -07:00
Fabrice Di Meglio
df61d0046c
Fix bug #17682629 Crash while accessing apps' settings
...
- add missing Material resource file
Change-Id: Ibf5f43c0c5a09b4e562fbe8f40778a89b560e211
2014-09-29 21:47:09 +00:00
RoboErik
165809b331
Send volume keys to the default stream if not actually playing
...
This ensures that we'll only adjust volume on a session's stream if
that stream is actually in use.
bug:17690423
Change-Id: I5fce8265a015bbc5034afa16719d9a0bbf257598
2014-09-29 14:43:10 -07:00
Chris Craik
3f873d8644
Implement alpha as documented for drawables
...
bug:17693526
With this change, outline opacity isn't published by default, as was
intended. Default behavior for custom drawables is to have a
rectangular outline, but not cast a shadow, e.g. as a button
background.
Change-Id: If80a256ff359bcb58f3f593ec9018f2df5fc4e44
2014-09-29 21:14:43 +00:00
RoboErik
9eef5bf8d1
Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
2014-09-29 20:48:11 +00:00
Ricardo Cervera
9f48394158
am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '808440cd5e1052f21b937cdcb60acecefd57f23c':
docs: Fixed path for build output.
2014-09-29 20:43:55 +00:00
Winson Chung
8bf05afc26
Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
...
Change-Id: I016dd8b7be9efa786291051152b1b56aac708e33
2014-09-29 13:42:49 -07:00
Deepanshu Gupta
052c4c4b7a
Merge "Update time in layout preview" into lmp-dev
2014-09-29 20:35:44 +00:00
RoboErik
df382cada1
Be more paranoid about threading in MediaSessionRecord
...
This makes copies of objects with bundles before posting to another
thread and is more aggressive about locking before making assignments
of mutable objects.
bug:17692568
Change-Id: I28e8229718b862c485e870fd2ca06a3a18a7c454
2014-09-29 13:21:47 -07:00
John Spurlock
39838b98f1
Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
2014-09-29 20:04:47 +00:00
John Spurlock
d8826bcb2b
Zen: Fix downtime calculation for Sunday mornings.
...
Previous calculation would always exit downtime on Sunday mornings,
due to the target day ending up at zero (an invalid day).
Bug:17682999
Change-Id: Icc5f01a42c3c644170eea9e60442cf77ce15a06c
2014-09-29 15:39:04 -04:00
Alan Viverette
1e6775ebb4
Merge "Update alert dialog message text style, list divider opacity" into lmp-dev
2014-09-29 19:21:22 +00:00
Alan Viverette
c8241c12c4
Update alert dialog message text style, list divider opacity
...
BUG: 17627843
BUG: 17694759
Change-Id: I9c5d08c8dd48b43a2485cc6fd213ef00bdeac8a4
2014-09-29 11:31:30 -07:00
Brian Carlstrom
0824da26b4
Add string for no boot.art notification
...
Bug: 17679443
Change-Id: Ib3283392882e8b35ee3a7903bbf71e8bfa948eed
2014-09-29 11:28:57 -07:00
Justin Koh
28d01e677c
Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
2014-09-29 18:24:04 +00:00
Deepanshu Gupta
8d5a15b691
Update time in layout preview
...
Change-Id: Ic32a9cb1f20b472c6898a5f370d8578c011a09bf
2014-09-29 09:38:59 -07:00
Jorim Jaggi
b514013083
Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
2014-09-29 16:31:55 +00:00
Baligh Uddin
e98a55e87e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:31:10 +00:00
Baligh Uddin
6744422b75
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:31:09 +00:00