151827 Commits

Author SHA1 Message Date
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
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
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
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
Baligh Uddin
3796031264 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:03 +00:00
Baligh Uddin
c570fff111 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:31:03 +00:00
Baligh Uddin
5ce474d71e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00
Baligh Uddin
04678abbe5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:58 +00:00
Baligh Uddin
b09aabfd5f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-29 16:30:54 +00:00
John Spurlock
e5238f7a8d Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev 2014-09-29 16:28:52 +00:00
Christoph Studer
f7c4509ffb Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 2014-09-29 16:13:29 +00:00
Christoph Studer
9ffa50096f NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
Bug: 17660485
Change-Id: I8684067538fcd2d43a9f95c6aa707b275b13ee40
2014-09-29 18:08:26 +02:00
John Spurlock
bee3b0a023 DozeLog: Keep keyguard monitor alive, keep emer call stats.
Ensure the existing keyguard callback survives weak reference
collection, and add missing emergency call stats append.

Bug:17496795
Change-Id: Iecec4646562cf1f6edb5bc5972767127f4419035
2014-09-29 11:30:12 -04:00
Ricardo Cervera
808440cd5e Merge "docs: Fixed path for build output." into klp-modular-docs 2014-09-29 14:56:30 +00:00
Jorim Jaggi
8a63806a8d Revert "Add massive logging to investigate blank Keyguard"
This reverts commit 10ead64346b2651be144ac591117cc2413d8caa3.

Bug: 17475334
Change-Id: Ie7103a2ede1f00a91a2afc51d9e6ecf5ae569545
2014-09-29 16:24:55 +02:00
Adrian Roos
51a400eb44 Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev 2014-09-29 13:49:40 +00:00
Adrian Roos
9d38f35a8f Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
By default, dreams should not get the in-window bars
because those conflict with the lights-out bar mode.

Bug: 17367264
Change-Id: I8c041c706f7a7c4791ed4760c34a5618fb7423d7
2014-09-29 15:48:46 +02:00
Jorim Jaggi
79107083ca Merge "Add option to enable scrim SRC optimization" into lmp-dev 2014-09-29 13:44:07 +00:00
Jorim Jaggi
e2ff1a4edb Merge "Fix overdraw" into lmp-dev 2014-09-29 13:43:20 +00:00