sreevanis
8888f02222
resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc
...
am: fdaac48e99
Change-Id: I8a1aa4000efa91d07d2d90dc8dd8938b30aed919
2016-08-04 02:38:44 +00:00
sreevanis
fdaac48e99
resolve merge conflicts of 9d47cae to nyc-docs
...
am: d5cabb92bc
Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
2016-08-04 02:23:39 +00:00
Meng Wang
d51b23564f
Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev
2016-08-04 02:12:14 +00:00
TreeHugger Robot
59a91c04cc
Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev
2016-08-04 01:27:34 +00:00
Kevin Hufnagle
6c955db797
docs: Updated wording of callout describing device opt-out options. am: b48909ed52
...
am: bdbe6fd94f
Change-Id: Id995adadf9dab72a2c5bc70a96a82220937bc7fe
2016-08-04 01:23:54 +00:00
Joe Fernandez
2500e4a1c1
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85
...
am: 6ad22ca614
Change-Id: I458b83999db483a628a2d33a4f3a4037c6f8b7be
2016-08-04 01:14:48 +00:00
Joe Fernandez
42e485c8d2
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462
...
am: 337279df50
Change-Id: Id7cc9a79f3f306df0aab10921c9b05809763293f
2016-08-04 01:14:43 +00:00
Joe Fernandez
bc10c93a2b
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28
...
am: 0af74fa732
Change-Id: Ie793990d142720d4d901b4e550446cce880d1a36
2016-08-04 01:14:37 +00:00
Kevin Hufnagle
6ed6297b5c
docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621
...
am: a007a4d772
Change-Id: Ia081e1e0be8059188b617e68b17ea34b4d8c409e
2016-08-04 01:13:52 +00:00
Kevin Hufnagle
22f5b5c5d4
docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f
...
am: ebd455b077
Change-Id: Id17e778bbd197afbf9c16a85ef9756358fbb27f4
2016-08-04 01:13:21 +00:00
TreeHugger Robot
96e80573e0
Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev
2016-08-04 01:05:11 +00:00
Kevin Hufnagle
bdbe6fd94f
docs: Updated wording of callout describing device opt-out options.
...
am: b48909ed52
Change-Id: I120725cdb7304e037bc72da73d56fbf901bfe9aa
2016-08-04 01:03:32 +00:00
Joe Fernandez
6ad22ca614
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
...
am: 51a582fa85
Change-Id: I8be83bf47ae26a6bf9d0f812265c91133be40be3
2016-08-04 00:57:22 +00:00
Joe Fernandez
337279df50
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
...
am: 712c053462
Change-Id: I113c2c5b9391488eedf743220f6ef4c5ec283d6c
2016-08-04 00:57:20 +00:00
Kevin Hufnagle
0af74fa732
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
...
am: d6f1d8ea28
Change-Id: I222fa49789c2f2baac7ff2296617052c9924a328
2016-08-04 00:57:16 +00:00
Kevin Hufnagle
a007a4d772
docs: Migrated "Android Runtime on Chrome" pages to DAC
...
am: 684d849621
Change-Id: Ic5e11fdcd44ce86f901cc22954192d79283bca93
2016-08-04 00:57:14 +00:00
Svetoslav Ganov
060f882035
Merge "Add historical logging to settings provider" into nyc-mr1-dev
2016-08-04 00:57:10 +00:00
Kevin Hufnagle
ebd455b077
docs: Added page on DAC describing ARC manifest file considerations.
...
am: 178caa888f
Change-Id: I68b8395dc90245ac7db6892f86b036d2b88ad96e
2016-08-04 00:56:42 +00:00
Joe Fernandez
11d8a4c49e
resolve merge conflicts of b29a938c to nyc-dev
...
am: 473738d6d3
Change-Id: I49bf89f5ed1696ec85c6b15559a97df2a9bcae04
2016-08-04 00:56:39 +00:00
Kevin Hufnagle
b48909ed52
docs: Updated wording of callout describing device opt-out options.
...
Bug: 30204612
Change-Id: I80b0a6840da6ca7310e626cec66717c3e1372403
2016-08-03 17:38:27 -07:00
Kevin Hufnagle
473738d6d3
resolve merge conflicts of b29a938c to nyc-dev
...
Change-Id: I840d069b8ffab03b0a7c1fc73ba7eae485c80abb
2016-08-03 17:18:15 -07:00
TreeHugger Robot
1584d5d6e2
Merge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev
2016-08-04 00:08:21 +00:00
Adam Lesinski
4d219da3c4
AAPT: Fix feature split generation of ID resources
...
ID resources that get generated on demand with the
notation @+id/name were previously not given the
appropriate type ID offset when being built as feature
splits.
This change declares an ID type ahead of time so that
the type ID offset is applied before IDs can be generated.
Bug:30607637
Change-Id: I122a9133cb01b35e9892103ec52fc228dc65bf1a
2016-08-03 16:54:15 -07:00
Joe Fernandez
ed500356fa
Merge "docs: Add ARC documentation TOC file" into nyc-dev
...
am: 7eb9f10fec
Change-Id: I1ca98164cf541692cb2b008f181025036b3ee1a3
2016-08-03 23:43:38 +00:00
Joe Fernandez
60e9bc98f9
docs: Add ARC documentation TOC file
...
am: a117b34777
Change-Id: Iba4a71217a0932b13dafc614bf40e479348b099b
2016-08-03 23:43:32 +00:00
Joe Fernandez
51a582fa85
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
2016-08-03 23:42:25 +00:00
Kevin Hufnagle
41ab38815a
Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev
...
am: 4c273d1ffe
Change-Id: I20554bf7a10f13fdb288b9bc3ce3aeb3aa63cacc
2016-08-03 23:42:12 +00:00
Kevin Hufnagle
9f9f99427d
docs: Added page on DAC describing ARC manifest file considerations.
...
am: 97a3d3c3a6
Change-Id: I592b2dc213333f5fe976e64b0f043ad0d2264109
2016-08-03 23:41:29 +00:00
Kevin Hufnagle
5433326763
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev
...
am: 369246377a
Change-Id: I95265cb968c1325b089a75c2372471472793cb05
2016-08-03 23:40:43 +00:00
Winson
c54c748ede
Ensuring that the dock state is opposite of the nav bar.
...
- The nav bar now moves to follow a specific edge of the device, so we
should always choose the opposite end of the screen to ensure a valid
drop target is accessible.
Bug: 30548794
Change-Id: Icac8adfb167a4115377d42ddd897ac94e02077a3
2016-08-03 16:39:38 -07:00
Joe Fernandez
712c053462
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
...
Bug: 30114799
Change-Id: I4884bf4a39ae99e661365040d5b34d5b8e2d2ea2
Original-Change-Id: Ib4e3c5b255c9e1e9c2894b3703deb1d38f252fba
2016-08-03 16:39:24 -07:00
Kevin Hufnagle
f18cb6894a
docs: Migrated "Android Runtime on Chrome" pages to DAC
...
am: 9cd48bb447
Change-Id: Ibcde96f750154e16c5bbc795f883aca7d37449d8
2016-08-03 23:38:54 +00:00
Joe Fernandez
d6f1d8ea28
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
2016-08-03 23:35:24 +00:00
TreeHugger Robot
073cf6e537
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-mr1-dev
2016-08-03 23:33:53 +00:00
Kevin Hufnagle
684d849621
docs: Migrated "Android Runtime on Chrome" pages to DAC
...
Bug: 30204612
Change-Id: I02a325100ee7f24bcd87c6f77a0d9e8799bae9a3
(cherry picked from commit 9cd48bb447 )
2016-08-03 23:32:26 +00:00
Kevin Hufnagle
178caa888f
docs: Added page on DAC describing ARC manifest file considerations.
...
Bug: 30114799
Change-Id: I9b8d67d09e4627f22a9fc58421dd52aa3650c235
(cherry picked from commit 97a3d3c3a6 )
2016-08-03 23:31:54 +00:00
Joe Fernandez
7eb9f10fec
Merge "docs: Add ARC documentation TOC file" into nyc-dev
2016-08-03 23:25:17 +00:00
Joe Fernandez
4c273d1ffe
Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev
2016-08-03 23:25:17 +00:00
Joe Fernandez
369246377a
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev
2016-08-03 23:25:17 +00:00
Joe Fernandez
b29a938c1e
docs: Add ARC documentation TOC file
...
b/30114799
Change-Id: I397f4712c82628f1b7aa4565fb5ab40381f9f5e2
(cherry picked from commit 129012530f )
2016-08-03 23:18:33 +00:00
Prashant Malani
ff38f6a699
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable am: 61038ddb61 -s ours am: 1353c06d83 -s ours
...
am: 122ad2f0bc -s ours
Change-Id: I3351a12b536c95c1046a89215ea89d7f512793dd
2016-08-03 23:14:34 +00:00
Kevin Hufnagle
9cd48bb447
docs: Migrated "Android Runtime on Chrome" pages to DAC
...
Bug: 30204612
Change-Id: I02a325100ee7f24bcd87c6f77a0d9e8799bae9a3
2016-08-03 16:07:52 -07:00
Prashant Malani
122ad2f0bc
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable am: 61038ddb61 -s ours
...
am: 1353c06d83 -s ours
Change-Id: I95ee4044d8d303a1cecb2a5a1e46ca371db86f3d
2016-08-03 23:07:08 +00:00
Selim Cinek
7120a476e7
Merge "Fixed a bug where groups would animate the wrong way" into nyc-mr1-dev
2016-08-03 23:03:04 +00:00
Selim Cinek
100165056e
Merge "Loading the camera preview correctly with direct boot" into nyc-mr1-dev
2016-08-03 23:02:48 +00:00
Prashant Malani
1353c06d83
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
...
am: 61038ddb61 -s ours
Change-Id: Id9a09514011ddf7c15106e22e06d24079e3cdb31
2016-08-03 23:01:50 +00:00
Svetoslav Ganov
a340bfd7a1
Add historical logging to settings provider
...
This change adds historical operations to the dump state
of the settings provider. The historica operations are
currently appended only on user-debug and eng builds.
These change is needed to help diagnose the referred
bug and improve the settings provider's maintenance.
bug:30561721
Change-Id: I58a1ba0d598c4d28adcb5e654ebb78cf947e94db
2016-08-03 15:48:44 -07:00
Prashant Malani
61038ddb61
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
...
Add an overlay setting, and keep the default to its existing value of
200.
Bug: 26552257
Change-Id: Ifd29d80e28e57c5cfc640d519a62144ab5e963fa
2016-08-03 15:28:13 -07:00
Christopher Tate
76389c00d3
Eliminate next-alarm-clock broadcast flapping
...
When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation. This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.
Bug 29501073
Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
2016-08-03 14:57:47 -07:00
Sergei Vasilinetc
ba3d4f6ea1
Merge "TextureView: destroy layer on destroyHardwareResources event" into nyc-mr1-dev
2016-08-03 21:54:10 +00:00