OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82...
Svetoslav Ganov [Mon, 19 Oct 2015 23:50:28 +0000 (23:50 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad
am: 2a95159d2c

* commit '2a95159d2cce4321205ca7f40027a97acc2fb77e':
  Don't allow concurrent permission requests.

8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82
Svetoslav Ganov [Mon, 19 Oct 2015 23:28:55 +0000 (23:28 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82
am: aebff7f1ad

* commit 'aebff7f1ad23299d1ed71e83a3e76619a1a03574':
  Don't allow concurrent permission requests.

8 years agoMerge "Don\'t allow concurrent permission requests." into mnc-dr-dev
Svetoslav Ganov [Mon, 19 Oct 2015 23:13:46 +0000 (23:13 +0000)]
Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.

8 years agoMerge "Don't allow concurrent permission requests." into mnc-dr-dev
Svetoslav Ganov [Mon, 19 Oct 2015 22:41:35 +0000 (22:41 +0000)]
Merge "Don't allow concurrent permission requests." into mnc-dr-dev

8 years agoam 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initi...
Aravind Akella [Mon, 19 Oct 2015 21:41:36 +0000 (21:41 +0000)]
am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a

* commit '73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
  Fix a possible race condition in SensorManager initialization.

8 years agoam 005d36d1: Merge "Fix a possible race condition in SensorManager initialization...
Aravind Akella [Mon, 19 Oct 2015 21:36:10 +0000 (21:36 +0000)]
am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a

* commit '005d36d1b0653fccc5aaea2af36a2622f6d74f34':
  Fix a possible race condition in SensorManager initialization.

8 years agoMerge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Aravind Akella [Mon, 19 Oct 2015 21:32:25 +0000 (21:32 +0000)]
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.

8 years agoMerge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev
Aravind Akella [Mon, 19 Oct 2015 21:15:28 +0000 (21:15 +0000)]
Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev

8 years agoFix a possible race condition in SensorManager initialization.
Aravind Akella [Fri, 16 Oct 2015 21:18:40 +0000 (14:18 -0700)]
Fix a possible race condition in SensorManager initialization.

Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc

8 years agoam e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 19 Oct 2015 16:08:22 +0000 (16:08 +0000)]
am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

* commit 'e0f00d04d4d68348a8baf03f3c51521389aff576':
  Import translations. DO NOT MERGE

8 years agoam a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev...
Geoff Mendal [Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

* commit 'a6e7b3ae756946212937054bb079da1d472c0cda':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:59:20 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 7ba59c3559  -s ours

* commit '7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:03:19 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import

8 years agoam ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am...
Geoff Mendal [Mon, 19 Oct 2015 14:22:21 +0000 (14:22 +0000)]
am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e  -s ours

* commit 'ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826':
  Import translations. DO NOT MERGE

8 years agoam 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours
Geoff Mendal [Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)]
am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e  -s ours

* commit '2a09706e86794f6482f005f5bcca2ee513a3b1d9':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:11:34 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am: 5e4863205e  -s ours

* commit '5e4863205ee459cd8813f45e91b2e67c603d38ef':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:01:55 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import

8 years agoam 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window...
Chris Wren [Sat, 17 Oct 2015 21:46:00 +0000 (21:46 +0000)]
am 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit '9c25e23c4b571f9c9ff3fd69408c4cfd03385e82':
  count notification peeks by window action

8 years agoam 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into...
Chris Wren [Sat, 17 Oct 2015 21:41:39 +0000 (21:41 +0000)]
am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit '3472f18e0218c7d7a991da50db8251471fd8c25d':
  count notification peeks by window action

8 years agoam c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
Chris Wren [Sat, 17 Oct 2015 21:35:25 +0000 (21:35 +0000)]
am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev

* commit 'c7f2058cefd00bdce31a77646afa407bdf269809':
  count notification peeks by window action

8 years agoMerge "count notification peeks by window action" into mnc-dr-dev
Chris Wren [Sat, 17 Oct 2015 21:30:37 +0000 (21:30 +0000)]
Merge "count notification peeks by window action" into mnc-dr-dev

8 years agoam 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:13:24 +0000 (07:13 +0000)]
am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
  Fix lens shading map origin calculation.

8 years agoam 7a027807: am c03443b2: Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:07:32 +0000 (07:07 +0000)]
am 7a027807: am c03443b2: Fix lens shading map origin calculation.

* commit '7a027807a73aaa578d8f7a457438daac73158af0':
  Fix lens shading map origin calculation.

8 years agoam c03443b2: Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:01:19 +0000 (07:01 +0000)]
am c03443b2: Fix lens shading map origin calculation.

* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.

8 years agoFix lens shading map origin calculation.
Ruben Brunk [Thu, 15 Oct 2015 00:46:52 +0000 (17:46 -0700)]
Fix lens shading map origin calculation.

Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486

8 years agoam 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the...
Selim Cinek [Fri, 16 Oct 2015 23:44:59 +0000 (23:44 +0000)]
am 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

* commit '4135092ce9381d5545f6ef1625a348c969614b33':
  Stopping chronometers now when the shade is closed

8 years agoam 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed...
Selim Cinek [Fri, 16 Oct 2015 23:40:12 +0000 (23:40 +0000)]
am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

* commit '303e5c410c17b2be84051b3692635e6e24e37530':
  Stopping chronometers now when the shade is closed

8 years agoam b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc...
Selim Cinek [Fri, 16 Oct 2015 23:34:43 +0000 (23:34 +0000)]
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

8 years agoMerge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
Selim Cinek [Fri, 16 Oct 2015 23:28:46 +0000 (23:28 +0000)]
Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev

8 years agoStopping chronometers now when the shade is closed
Selim Cinek [Mon, 21 Sep 2015 13:47:20 +0000 (15:47 +0200)]
Stopping chronometers now when the shade is closed

Bug: 23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12

8 years agoam b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are...
Bryce Lee [Fri, 16 Oct 2015 22:33:23 +0000 (22:33 +0000)]
am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev

* commit 'b70426b197c373ccd8ab46c080fedf66e43d52e3':
  Add capability to identify phone accounts that are emergency only.

8 years agoam c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics...
Matthew Williams [Fri, 16 Oct 2015 22:33:17 +0000 (22:33 +0000)]
am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.

* commit 'c85315acdf028d09b178e2c9a6ec66374652894a':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.

8 years agoam 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency...
Bryce Lee [Fri, 16 Oct 2015 22:29:32 +0000 (22:29 +0000)]
am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev

* commit '4c9fcd5412a190c6e73f25346cf13c67286fa01e':
  Add capability to identify phone accounts that are emergency only.

8 years agoam 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
Matthew Williams [Fri, 16 Oct 2015 22:29:26 +0000 (22:29 +0000)]
am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.

* commit '9a365194861e78dd5edbebf292aaa7e48804ab46':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.

8 years agoMerge "Add capability to identify phone accounts that are emergency only." into cw...
Bryce Lee [Fri, 16 Oct 2015 22:26:48 +0000 (22:26 +0000)]
Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev

8 years agoam 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
Matthew Williams [Fri, 16 Oct 2015 22:25:12 +0000 (22:25 +0000)]
am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.

* commit '1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.

8 years agoam 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline...
Roozbeh Pournader [Fri, 16 Oct 2015 22:12:46 +0000 (22:12 +0000)]
am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev

* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.

8 years agoam b3538082: am 5362f273: Merge "Fix line height problem with inline images in Static...
Roozbeh Pournader [Fri, 16 Oct 2015 22:06:21 +0000 (22:06 +0000)]
am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev

* commit 'b3538082d78284165ff0dbe5a04992afe2018d0b':
  Fix line height problem with inline images in StaticLayout.

8 years agoam 5362f273: Merge "Fix line height problem with inline images in StaticLayout."...
Roozbeh Pournader [Fri, 16 Oct 2015 22:01:49 +0000 (22:01 +0000)]
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.

8 years agoDO NOT MERGE Sanity check loaded periodics and cap runtime.
Matthew Williams [Thu, 15 Oct 2015 22:59:12 +0000 (15:59 -0700)]
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)

8 years agoMerge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
Roozbeh Pournader [Fri, 16 Oct 2015 21:54:12 +0000 (21:54 +0000)]
Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev

8 years agoam 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color...
Adrian Roos [Fri, 16 Oct 2015 21:12:06 +0000 (21:12 +0000)]
am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev

* commit '3c439c720d460266358c10d8d2eea9ef9e79beb0':
  Fix wrongly laid out navigation color view

8 years agoam 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into...
Adrian Roos [Fri, 16 Oct 2015 20:54:40 +0000 (20:54 +0000)]
am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev

* commit '85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
  Fix wrongly laid out navigation color view

8 years agoam 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
Adrian Roos [Fri, 16 Oct 2015 20:49:59 +0000 (20:49 +0000)]
am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev

* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view

8 years agoMerge "Fix wrongly laid out navigation color view" into mnc-dr-dev
Adrian Roos [Fri, 16 Oct 2015 20:43:32 +0000 (20:43 +0000)]
Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev

8 years agoDon't allow concurrent permission requests.
Svetoslav [Thu, 15 Oct 2015 23:54:00 +0000 (16:54 -0700)]
Don't allow concurrent permission requests.

bug:24690277

Change-Id: Ie8c6eae230cd20e40d32cf688d30f6d40f9a9acd

8 years agocount notification peeks by window action
Chris Wren [Fri, 16 Oct 2015 20:24:20 +0000 (16:24 -0400)]
count notification peeks by window action

Bug: 20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335

8 years agoam 542052dd: am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to...
Julia Reynolds [Fri, 16 Oct 2015 19:55:25 +0000 (19:55 +0000)]
am 542052dd: am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev

* commit '542052dd83e89f7cebc07aa0004a8592efc12364':
  Add 'until next alarm' option to QS zen panel.

8 years agoam 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel...
Julia Reynolds [Fri, 16 Oct 2015 19:48:47 +0000 (19:48 +0000)]
am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev

* commit '96faf5c8fad5114dda807eee1c94a1c0dc021fe8':
  Add 'until next alarm' option to QS zen panel.

8 years agoam a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
Julia Reynolds [Fri, 16 Oct 2015 19:41:54 +0000 (19:41 +0000)]
am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev

* commit 'a762c210d2901bedce5b7972eb139c4d5e59dcd1':
  Add 'until next alarm' option to QS zen panel.

8 years agoam 6331753e: am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic...
Matthew Williams [Fri, 16 Oct 2015 19:39:23 +0000 (19:39 +0000)]
am 6331753e: am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev

* commit '6331753e3ba9d6c66c562836f28f3b6e1e178ecd':
  DO NOT MERGE Change scheduling logic to run network jobs sooner

8 years agoMerge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev
Julia Reynolds [Fri, 16 Oct 2015 19:38:22 +0000 (19:38 +0000)]
Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev

8 years agoam b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network...
Matthew Williams [Fri, 16 Oct 2015 19:01:55 +0000 (19:01 +0000)]
am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev

* commit 'b01a963a2dd3e4e84eee18f691efdc7856d16ff0':
  DO NOT MERGE Change scheduling logic to run network jobs sooner

8 years agoam 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner...
Matthew Williams [Fri, 16 Oct 2015 18:55:33 +0000 (18:55 +0000)]
am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev

* commit '6875011626e5815473b5d19ddc92d4888bad29f4':
  DO NOT MERGE Change scheduling logic to run network jobs sooner

8 years agoMerge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc...
Matthew Williams [Fri, 16 Oct 2015 18:51:48 +0000 (18:51 +0000)]
Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev

8 years agoam 824347dd: am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into...
Adam Powell [Fri, 16 Oct 2015 18:27:05 +0000 (18:27 +0000)]
am 824347dd: am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev

* commit '824347dd8afc3b8b40e28e4b5d0743b56e341b98':
  Fix ChooserTarget app scoring

8 years agoam d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 18:21:58 +0000 (18:21 +0000)]
am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev

* commit 'd08f339bcc80bbf368bb7c7b9ddb77d6a9d613fd':
  Fix ChooserTarget app scoring

8 years agoam 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 18:13:19 +0000 (18:13 +0000)]
am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev

* commit '749334bffbc92aeaef27c274a1586fa7365cbfdc':
  Fix ChooserTarget app scoring

8 years agoMerge "Fix ChooserTarget app scoring" into mnc-dr-dev
Adam Powell [Fri, 16 Oct 2015 18:08:36 +0000 (18:08 +0000)]
Merge "Fix ChooserTarget app scoring" into mnc-dr-dev

8 years agoFix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 17:47:32 +0000 (10:47 -0700)]
Fix ChooserTarget app scoring

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

8 years agoam 723900d7: am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config...
Tyler Gunn [Fri, 16 Oct 2015 17:52:17 +0000 (17:52 +0000)]
am 723900d7: am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev

* commit '723900d76a45e8974f357333b72a7df0a7ec4fca':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.

8 years agoam 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone...
Tyler Gunn [Fri, 16 Oct 2015 17:45:31 +0000 (17:45 +0000)]
am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev

* commit '95b84f52517548adbd0dff7a22c41c5c4d249c44':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.

8 years agoam a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA...
Tyler Gunn [Fri, 16 Oct 2015 17:40:19 +0000 (17:40 +0000)]
am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev

* commit 'a5917b71b0e2f98fa6906b795b28cab059cc092b':
  DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.

8 years agoMerge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc...
Tyler Gunn [Fri, 16 Oct 2015 17:36:40 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev

8 years agoam 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating...
Abodunrinwa Toki [Fri, 16 Oct 2015 16:56:38 +0000 (16:56 +0000)]
am 85978d7c: am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev

* commit '85978d7c36e94f107bd72166bc18f893b4817cf9':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.

8 years agoam a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appea...
Abodunrinwa Toki [Fri, 16 Oct 2015 16:49:19 +0000 (16:49 +0000)]
am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev

* commit 'a3234f01927e6908cc4e08ddcff9c1646d5a91bb':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.

8 years agoDO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.
Roshan Pius [Fri, 14 Aug 2015 19:58:08 +0000 (12:58 -0700)]
DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA.

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

8 years agoam 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into...
Abodunrinwa Toki [Fri, 16 Oct 2015 16:41:26 +0000 (16:41 +0000)]
am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev

* commit '9c76f61dea69e21eba3b89adbc2a00bcb522584e':
  DO NOT MERGE: Reduce delay of floating toolbar appearance.

8 years agoam d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavi...
Jeff Sharkey [Fri, 16 Oct 2015 16:38:29 +0000 (16:38 +0000)]
am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

* commit 'd56756fdee9fce3d08bea769710d7173bcbc263a':
  Update docs to reflect adoptable behavior.

8 years agoMerge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev
Abodunrinwa Toki [Fri, 16 Oct 2015 16:36:28 +0000 (16:36 +0000)]
Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev

8 years agoam ad8e78c7: am 29ffdc91: am be655510: Merge "Disassociate system windows from apps...
Wale Ogunwale [Fri, 16 Oct 2015 16:33:48 +0000 (16:33 +0000)]
am ad8e78c7: am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev

* commit 'ad8e78c7033b2f5977f779ff8d85a4a8a690d362':
  Disassociate system windows from apps

8 years agoam 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into...
Jeff Sharkey [Fri, 16 Oct 2015 16:33:18 +0000 (16:33 +0000)]
am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

* commit '535726f637d952f172e7758e4f0faf725a838add':
  Update docs to reflect adoptable behavior.

8 years agoam 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc...
Wale Ogunwale [Fri, 16 Oct 2015 16:28:26 +0000 (16:28 +0000)]
am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev

* commit '29ffdc91b8a6adeab036d56cb57cbd363a0196d0':
  Disassociate system windows from apps

8 years agoam 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:25:38 +0000 (16:25 +0000)]
am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
  Update docs to reflect adoptable behavior.

8 years agoam be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev
Wale Ogunwale [Fri, 16 Oct 2015 16:18:45 +0000 (16:18 +0000)]
am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev

* commit 'be6555105a9325d0b7073c08a0bd4dc0b5ce1fb3':
  Disassociate system windows from apps

8 years agoMerge "Update docs to reflect adoptable behavior." into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:18:38 +0000 (16:18 +0000)]
Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

8 years agoMerge "Disassociate system windows from apps" into mnc-dr-dev
Wale Ogunwale [Fri, 16 Oct 2015 16:14:45 +0000 (16:14 +0000)]
Merge "Disassociate system windows from apps" into mnc-dr-dev

8 years agoDisassociate system windows from apps
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps

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

8 years agoDO NOT MERGE: Reduce delay of floating toolbar appearance.
Abodunrinwa Toki [Fri, 16 Oct 2015 14:54:53 +0000 (15:54 +0100)]
DO NOT MERGE: Reduce delay of floating toolbar appearance.

Bug: 21956394
Change-Id: I3db39e84afd3474b5bb53522c5a4c738ec1511bf

8 years agoam fceaedda: am 75693994: Merge "Disassociate system windows from apps"
Wale Ogunwale [Fri, 16 Oct 2015 14:00:47 +0000 (14:00 +0000)]
am fceaedda: am 75693994: Merge "Disassociate system windows from apps"

* commit 'fceaedda41f9133a4d4213720b15950ef43dd00c':
  Disassociate system windows from apps

8 years agoam 75693994: Merge "Disassociate system windows from apps"
Wale Ogunwale [Fri, 16 Oct 2015 13:54:54 +0000 (13:54 +0000)]
am 75693994: Merge "Disassociate system windows from apps"

* commit '75693994f60bdec9a10db98ddb8addd2bc3f8bbb':
  Disassociate system windows from apps

8 years agoMerge "Disassociate system windows from apps"
Wale Ogunwale [Fri, 16 Oct 2015 13:50:35 +0000 (13:50 +0000)]
Merge "Disassociate system windows from apps"

8 years agoFix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 09:27:03 +0000 (02:27 -0700)]
Fix line height problem with inline images in StaticLayout.

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

8 years agoDisassociate system windows from apps
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps

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:
https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c

8 years agoam cf471efd: am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug...
Sanket Padawe [Fri, 16 Oct 2015 00:57:02 +0000 (00:57 +0000)]
am cf471efd: am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit 'cf471efd5f722a4cb7c1094e30b111ef312ef133':
  Mask IccId which gets printed in bug reports & radio logs.

8 years agoam 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio...
Sanket Padawe [Fri, 16 Oct 2015 00:51:49 +0000 (00:51 +0000)]
am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit '001a651e4b0919239f09b25ae99d132585b5d382':
  Mask IccId which gets printed in bug reports & radio logs.

8 years agoam 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into...
Sanket Padawe [Fri, 16 Oct 2015 00:41:44 +0000 (00:41 +0000)]
am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit '8d6d735fa8cea74f53ba29063b72b856fef69d8e':
  Mask IccId which gets printed in bug reports & radio logs.

8 years agoMerge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
Sanket Padawe [Fri, 16 Oct 2015 00:38:55 +0000 (00:38 +0000)]
Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

8 years agoDO NOT MERGE Change scheduling logic to run network jobs sooner
Matthew Williams [Thu, 15 Oct 2015 23:08:05 +0000 (16:08 -0700)]
DO NOT MERGE Change scheduling logic to run network jobs sooner

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)

8 years agoam 401f68b9: am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not...
Dianne Hackborn [Thu, 15 Oct 2015 23:22:10 +0000 (23:22 +0000)]
am 401f68b9: am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

* commit '401f68b93aa9eca88d8dd126b92128bdc3371064':
  Fix issue #24571425: Device does not come out of idle mode for maintenance

8 years agoam b36aebbe: am ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall...
Alan Viverette [Thu, 15 Oct 2015 23:22:04 +0000 (23:22 +0000)]
am b36aebbe: am ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall spinners

* commit 'b36aebbe69c368294694a0c7c84e692167132037':
  Don't project ripple for adequately tall spinners

8 years agoam 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of...
Dianne Hackborn [Thu, 15 Oct 2015 23:19:06 +0000 (23:19 +0000)]
am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

* commit '510f03c5ac057122569264bd005b2e26f96236ae':
  Fix issue #24571425: Device does not come out of idle mode for maintenance

8 years agoam ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall spinners
Alan Viverette [Thu, 15 Oct 2015 23:19:00 +0000 (23:19 +0000)]
am ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall spinners

* commit 'ffa8fd0ed4a624833e1da10cbabeec175eef7b35':
  Don't project ripple for adequately tall spinners

8 years agoam 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for...
Dianne Hackborn [Thu, 15 Oct 2015 23:12:39 +0000 (23:12 +0000)]
am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

* commit '56f41971483647e954179301ae40180063d0eba8':
  Fix issue #24571425: Device does not come out of idle mode for maintenance

8 years agoam 6a032a3a: Don\'t project ripple for adequately tall spinners
Alan Viverette [Thu, 15 Oct 2015 23:12:34 +0000 (23:12 +0000)]
am 6a032a3a: Don\'t project ripple for adequately tall spinners

* commit '6a032a3aba3741ce55679b97c2f048b523d465de':
  Don't project ripple for adequately tall spinners

8 years agoMerge "Fix issue #24571425: Device does not come out of idle mode for maintenance...
Dianne Hackborn [Thu, 15 Oct 2015 23:11:12 +0000 (23:11 +0000)]
Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

8 years agoDon't project ripple for adequately tall spinners
Alan Viverette [Thu, 15 Oct 2015 22:50:21 +0000 (15:50 -0700)]
Don't project ripple for adequately tall spinners

Bug: 24674907
Change-Id: I1674c14f321600a40ca20adab1d40459963d2d1b

8 years agoMask IccId which gets printed in bug reports & radio logs.
Sanket Padawe [Thu, 15 Oct 2015 22:46:39 +0000 (15:46 -0700)]
Mask IccId which gets printed in bug reports & radio logs.

Bug: 24941148
Change-Id: Ibe397f5d9b0da245e3e64f626937db4792c7f3c2

8 years agoFix wrongly laid out navigation color view
Adrian Roos [Thu, 15 Oct 2015 22:38:38 +0000 (15:38 -0700)]
Fix wrongly laid out navigation color view

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