201741 Commits

Author SHA1 Message Date
Alan Viverette
e3d745291e Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev
am: 840f38905c

* commit '840f38905c073044077cb2bef68d20971f5d3d39':
  Update drawable matrix when bounds change in invalidateDrawable()
2015-10-20 17:24:45 +00:00
George Mount
ee15f087db Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev
am: 1313020acc

* commit '1313020acc93e601c98779d8859f44391c504ba2':
  Set the bounds on the drawable for ChangeBounds reparenting.
2015-10-20 17:23:45 +00:00
Alan Viverette
840f38905c Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev 2015-10-20 16:54:12 +00:00
George Mount
1313020acc Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev 2015-10-20 16:41:33 +00:00
Michael Wright
bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev.
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
2015-10-20 17:06:27 +01:00
Michael Wright
57a5cba606 Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev 2015-10-20 15:31:01 +00:00
Todd Kennedy
6320767fb1 Merge "Retain fragment loaders" into mnc-dr-dev
am: ad968cf4e5

* commit 'ad968cf4e55afdd897ea84a44b7450442aea1e1d':
  Retain fragment loaders
2015-10-20 14:41:23 +00:00
Todd Kennedy
ad968cf4e5 Merge "Retain fragment loaders" into mnc-dr-dev 2015-10-20 14:36:00 +00:00
Alan Viverette
01320de844 Update drawable matrix when bounds change in invalidateDrawable()
Bug: 24797872
Change-Id: Ib2bcce6f7d6fab33633a915882821b00d94e4e44
2015-10-20 13:51:21 +00:00
Adam Powell
eeed032eae Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev
am: 4ecfbcfdea

* commit '4ecfbcfdeaed67c3a08002069a530fa58582a48b':
  DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
2015-10-20 00:54:34 +00:00
Adam Powell
4ecfbcfdea Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev 2015-10-20 00:33:37 +00:00
Adam Powell
918b90108b DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
An old optimization in ViewRoot prevents updating a window surface
while a window animation is playing. SystemUI and other small system
components that blend these animations disable this for a smoother
experience. Disable it in ResolverActivity as well.

Bug 24989381

Change-Id: Iac7d1c7b1101ed8d2bc4c3557277a773ce871beb
2015-10-19 16:56:20 -07:00
Adrian Roos
574b5f71e8 Merge "Reload content description of KeyButtonView" into mnc-dr-dev
am: 9a345f31f2

* commit '9a345f31f23fc581f9ce501e854c821e865920ca':
  Reload content description of KeyButtonView
2015-10-19 23:43:32 +00:00
George Mount
ef396b57c6 Set the bounds on the drawable for ChangeBounds reparenting.
Bug 24993183

The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.

Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584
(cherry picked from commit f2a3703696f5dc8b1a0d243051e0db65c2145452)
2015-10-19 23:42:38 +00:00
Todd Kennedy
2ee19c7f46 Retain fragment loaders
Remove the partial fix [it did not work for child fragment managers]
and replace with a more general fix that works with all fragments.

Bug: 23838271
Change-Id: I88b465f6a06a6ad627b9651b9e2eea41fae08972
2015-10-19 16:40:03 -07:00
Adrian Roos
9a345f31f2 Merge "Reload content description of KeyButtonView" into mnc-dr-dev 2015-10-19 23:26:47 +00:00
Todd Kennedy
ec8a4ecc92 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-19 23:25:04 +00:00
Todd Kennedy
d419d86952 Merge "Set host when restoring a fragment" into mnc-dr-dev
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
2015-10-19 23:22:57 +00:00
Todd Kennedy
17b2b27f64 Merge "Set host when restoring a fragment" into mnc-dr-dev
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
2015-10-19 23:19:51 +00:00
Mathieu Chartier
df0cc41a7b Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
am: 7f2deeeef5

* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
  Fix read_mapinfo to recognize free list large object space
2015-10-19 23:17:09 +00:00
Svetoslav Ganov
aebff7f1ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.
2015-10-19 23:13:46 +00:00
Todd Kennedy
986d4b482d Merge "Set host when restoring a fragment" into mnc-dr-dev 2015-10-19 22:52:27 +00:00
Mathieu Chartier
7f2deeeef5 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev 2015-10-19 22:47:45 +00:00
Mathieu Chartier
2e2069d053 Fix read_mapinfo to recognize free list large object space
Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
2015-10-19 15:44:26 -07:00
Svetoslav Ganov
e199016a82 Merge "Don't allow concurrent permission requests." into mnc-dr-dev 2015-10-19 22:41:35 +00:00
Aravind Akella
005d36d1b0 Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
am: a817c90a7a

* commit 'a817c90a7ab296473345b0e106acc9be4e5b678c':
  Fix a possible race condition in SensorManager initialization.
2015-10-19 21:32:25 +00:00
Aravind Akella
a817c90a7a Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 2015-10-19 21:15:28 +00:00
Todd Kennedy
ac0e6ca0d2 Set host when restoring a fragment
When we restore a fragment [i.e. on configuration change], we need to
make sure the host is set prior to calling into lifecycle methods
such as onInflate(). These use data contained within the host.

Bug: 22512520
Change-Id: I709365a858cfc555ec5b7fc200629fa8d022faad
2015-10-19 12:55:19 -07:00
Aravind Akella
a05df455e8 Fix a possible race condition in SensorManager initialization.
Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
2015-10-19 12:18:37 -07:00
Geoff Mendal
a6e7b3ae75 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 7ba59c3559  -s ours

* commit '7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
  Import translations. DO NOT MERGE
2015-10-19 15:59:20 +00:00
Geoff Mendal
7ba59c3559 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 15:55:17 +00:00
Geoff Mendal
c555378f4c Import translations. DO NOT MERGE
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
2015-10-19 08:03:19 -07:00
Geoff Mendal
2a09706e86 Import translations. DO NOT MERGE
am: 5e4863205e  -s ours

* commit '5e4863205ee459cd8813f45e91b2e67c603d38ef':
  Import translations. DO NOT MERGE
2015-10-19 14:11:34 +00:00
Geoff Mendal
5e4863205e Import translations. DO NOT MERGE
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
2015-10-19 07:01:55 -07:00
Chris Wren
3472f18e02 am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit 'c7f2058cefd00bdce31a77646afa407bdf269809':
  count notification peeks by window action
2015-10-17 21:35:25 +00:00
Chris Wren
c7f2058cef Merge "count notification peeks by window action" into mnc-dr-dev 2015-10-17 21:30:37 +00:00
Ruben Brunk
7a027807a7 am c03443b2: Fix lens shading map origin calculation.
* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.
2015-10-17 07:01:19 +00:00
Ruben Brunk
c03443b23d Fix lens shading map origin calculation.
Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
2015-10-17 06:55:15 +00:00
Adrian Roos
3bab515b19 Reload content description of KeyButtonView
Reload the content description whenever the
configuration changes.

Bug: 24977838
Change-Id: I875f0d83976b7d007a9bb2e56b28ff8fb6365a38
2015-10-16 23:53:12 +00:00
Selim Cinek
303e5c410c am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit 'b9a73d2ce34b35684a282c8521d65f52fea1197a':
  Stopping chronometers now when the shade is closed
2015-10-16 23:34:43 +00:00
Selim Cinek
b9a73d2ce3 Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 2015-10-16 23:28:46 +00:00
Selim Cinek
98713a4fcf Stopping chronometers now when the shade is closed
Bug: 23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
2015-10-16 15:58:10 -07:00
Bryce Lee
4c9fcd5412 Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 2015-10-16 22:26:48 +00:00
Matthew Williams
9a36519486 am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
2015-10-16 22:25:12 +00:00
Roozbeh Pournader
b3538082d7 am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '5362f273e91885041b7cb246667cff3ceca74703':
  Fix line height problem with inline images in StaticLayout.
2015-10-16 22:01:49 +00:00
Matthew Williams
1f0ec16b6d DO NOT MERGE Sanity check loaded periodics and cap runtime.
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)
2015-10-16 21:56:55 +00:00
Roozbeh Pournader
5362f273e9 Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 2015-10-16 21:54:12 +00:00
Adrian Roos
85fae34e81 am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view
2015-10-16 20:49:59 +00:00
Adrian Roos
70ea857859 Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 2015-10-16 20:43:32 +00:00
Svetoslav
ffb32b1f24 Don't allow concurrent permission requests.
bug:24690277

Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd
2015-10-16 13:42:32 -07:00