OSDN Git Service

android-x86/frameworks-base.git
7 years agoDocs: Fixed typo in API Overview am: 844c43a904 am: 653b768997
Bert McMeen [Thu, 4 Aug 2016 18:51:04 +0000 (18:51 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904 am: 653b768997
am: 85e3fee7d3

Change-Id: I245b6ae214615105193d96ed17a401fc8c85d0ef

7 years agoMerge "only rate limit notification updates" into nyc-mr1-dev
Chris Wren [Thu, 4 Aug 2016 18:40:10 +0000 (18:40 +0000)]
Merge "only rate limit notification updates" into nyc-mr1-dev
am: 118cb7d0f7

Change-Id: I62a76d56addbb86a02f75405c6fe8780022e9af4

7 years agoonly rate limit notification updates
Chris Wren [Thu, 4 Aug 2016 18:40:08 +0000 (18:40 +0000)]
only rate limit notification updates
am: a61f179c3d

Change-Id: I1b140eb26b2cb69c314bcc2f3543dbe3431290c3

7 years agoDocs: Fixed typo in API Overview am: 844c43a904
Bert McMeen [Thu, 4 Aug 2016 18:28:47 +0000 (18:28 +0000)]
Docs: Fixed typo in API Overview am: 844c43a904
am: 653b768997

Change-Id: I56caec3330282d1acf9772d0ad21c27b31e2f602

7 years agoMerge "only rate limit notification updates" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 18:25:10 +0000 (18:25 +0000)]
Merge "only rate limit notification updates" into nyc-mr1-dev

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Thu, 4 Aug 2016 18:20:51 +0000 (18:20 +0000)]
Docs: Fixed typo in API Overview
am: 844c43a904

Change-Id: Ia855a58708afc4f12bae4b234b0f7ba10798aba4

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12
Bert McMeen [Thu, 4 Aug 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev am: 62faea4f12
am: 3e0e7ef340

Change-Id: I5d1468bc889a0a6bacf65d3d1921a728bc71aa85

7 years agoDocs: Fixed typo in API Overview am: f27ab3c126
Bert McMeen [Thu, 4 Aug 2016 18:16:26 +0000 (18:16 +0000)]
Docs: Fixed typo in API Overview am: f27ab3c126
am: ffe51968a5

Change-Id: I91894d0898de8e1fbe5bfbcbf6c38e76660ddba4

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev
Bert McMeen [Thu, 4 Aug 2016 18:09:25 +0000 (18:09 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev
am: 62faea4f12

Change-Id: I29a6d5c083e527643cea4da8e666ba363040364e

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Thu, 4 Aug 2016 18:09:22 +0000 (18:09 +0000)]
Docs: Fixed typo in API Overview
am: f27ab3c126

Change-Id: I64dced0229d1017f30a34790a8adfb36ed9e3d67

7 years agoDocs: Fixed typo in API Overview
Bert McMeen [Tue, 2 Aug 2016 20:45:24 +0000 (13:45 -0700)]
Docs: Fixed typo in API Overview

Bug: 30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
(cherry picked from commit f27ab3c12625f34a4221477001a603390b505e65)

7 years agoMerge "Docs: Fixed typo in API Overview" into nyc-dev
Bert McMeen [Thu, 4 Aug 2016 18:01:27 +0000 (18:01 +0000)]
Merge "Docs: Fixed typo in API Overview" into nyc-dev

7 years agoMerge "We don't need to wait to pin the camera app." into nyc-mr1-dev
Jeff Sharkey [Thu, 4 Aug 2016 17:59:40 +0000 (17:59 +0000)]
Merge "We don't need to wait to pin the camera app." into nyc-mr1-dev
am: b0da868b63

Change-Id: I6a308fa40e3affd0db9446b4253a89f39da11118

7 years agoWe don't need to wait to pin the camera app.
Jeff Sharkey [Thu, 4 Aug 2016 17:59:38 +0000 (17:59 +0000)]
We don't need to wait to pin the camera app.
am: 847bd85fc1

Change-Id: Id4f657028e2866bf51dd31208c2446031e46aac7

7 years agoMerge "We don't need to wait to pin the camera app." into nyc-mr1-dev
Jeff Sharkey [Thu, 4 Aug 2016 17:51:18 +0000 (17:51 +0000)]
Merge "We don't need to wait to pin the camera app." into nyc-mr1-dev

7 years agoonly rate limit notification updates
Chris Wren [Thu, 4 Aug 2016 15:24:42 +0000 (11:24 -0400)]
only rate limit notification updates

Updates to progress bars are the main culprit in system
performance events caused by apps spamming the notification
service. Rate-limiting only updates allows us to set a lower
threshold wihtout the owrry of mistakenly dropping bursts of
notifications being quickly posted after a network sync.

Also reduce logspam caused by the rate-limit events.

Bug: 30132961
Change-Id: I49acda6a2831204da45e899ddd3d62d571d7174b

7 years agoFix NPE in TextureView
John Reck [Thu, 4 Aug 2016 16:43:29 +0000 (16:43 +0000)]
Fix NPE in TextureView
am: 3c2587f26e

Change-Id: I79f35e5029cb3abb5fa74a60e448cd09835e2112

7 years agoFix NPE in TextureView
John Reck [Thu, 4 Aug 2016 14:55:38 +0000 (07:55 -0700)]
Fix NPE in TextureView

Bug: 30651595
Change-Id: Ic6cc2a1598de173aaadb4061562236a563a662b3

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 4 Aug 2016 09:35:14 +0000 (09:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8437fce56d  -s ours

Change-Id: Ia70f51adc96f98491dc90cdf12ec220d486f4426

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 09:35:11 +0000 (09:35 +0000)]
Import translations. DO NOT MERGE
am: 1094f3a3ff  -s ours

Change-Id: Ia6292d00abee909526e2832374038d16a0ab1435

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 4 Aug 2016 09:27:54 +0000 (09:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 3ff12c2a1b  -s ours

Change-Id: Iaf9ad0d4b3d784acc891697438fadcfb3a73ab54

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 09:27:52 +0000 (09:27 +0000)]
Import translations. DO NOT MERGE
am: cfd9728512  -s ours

Change-Id: I421fbebb3675b3ed2b19a8bbc121426351aa4e62

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 4 Aug 2016 09:27:49 +0000 (09:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 85c61142ab  -s ours

Change-Id: I007993430ab0258ab6ade39a7c2f8e5705f526f8

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 09:27:47 +0000 (09:27 +0000)]
Import translations. DO NOT MERGE
am: 4d9a70a15d  -s ours

Change-Id: I3c251a6eebedce1013e0d0961a80a561bb28ed45

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:21:54 +0000 (09:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:19:06 +0000 (09:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:18:53 +0000 (09:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:16:49 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 05:54:00 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 05:39:09 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev
Andreas Gampe [Thu, 4 Aug 2016 04:30:09 +0000 (04:30 +0000)]
Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev
am: 6bd0d6b754

Change-Id: I50912905578d9ab87e6a4862dd17277b522577cb

7 years agoOtaDexopt: Special-case system app classpaths
Andreas Gampe [Thu, 4 Aug 2016 04:30:07 +0000 (04:30 +0000)]
OtaDexopt: Special-case system app classpaths
am: c7e02c1d2a

Change-Id: I11bdba24aec736f1ef3e1023acab63a9680c6183

7 years agoMerge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 03:35:35 +0000 (03:35 +0000)]
Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev

7 years agoMerge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0...
sreevanis [Thu, 4 Aug 2016 02:58:29 +0000 (02:58 +0000)]
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0 am: f5a2fbc156
am: 6421beee8e

Change-Id: I8523ef90758ec7f16b702cdbc81d4009076b0461

7 years agoresolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc am: fdaac48e99
sreevanis [Thu, 4 Aug 2016 02:58:27 +0000 (02:58 +0000)]
resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc am: fdaac48e99
am: 8888f02222

Change-Id: Ic41b030beb3ebf71baf78bd52abfb801f7f086cf

7 years agoMerge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
Sreevani Sreejith [Thu, 4 Aug 2016 02:38:47 +0000 (02:38 +0000)]
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
am: f5a2fbc156

Change-Id: I37eb8462dcf65783d64c71336ee0d7fc8a354c4e

7 years agoresolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc
sreevanis [Thu, 4 Aug 2016 02:38:44 +0000 (02:38 +0000)]
resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc
am: fdaac48e99

Change-Id: I8a1aa4000efa91d07d2d90dc8dd8938b30aed919

7 years agoMerge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev
Meng Wang [Thu, 4 Aug 2016 02:26:10 +0000 (02:26 +0000)]
Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev
am: d51b23564f

Change-Id: I5656b0e866b5a21c635be8e81734cb5642fc61df

7 years agoAdd carrierconfig enhanced_4g_lte_title_variant_bool
Meng Wang [Thu, 4 Aug 2016 02:25:58 +0000 (02:25 +0000)]
Add carrierconfig enhanced_4g_lte_title_variant_bool
am: 542e262605

Change-Id: Ib74946abb41f733d20469768197a8a3fe828b7f1

7 years agoMerge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs
sreevanis [Thu, 4 Aug 2016 02:23:43 +0000 (02:23 +0000)]
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs
am: 3faf6114b0

Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6

7 years agoresolve merge conflicts of 9d47cae to nyc-docs
sreevanis [Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)]
resolve merge conflicts of 9d47cae to nyc-docs
am: d5cabb92bc

Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead

7 years agoMerge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs
Sreevani Sreejith [Thu, 4 Aug 2016 02:14:25 +0000 (02:14 +0000)]
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs

7 years agoMerge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev
Meng Wang [Thu, 4 Aug 2016 02:12:12 +0000 (02:12 +0000)]
Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev

7 years agoMerge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev
Adam Lesinski [Thu, 4 Aug 2016 01:46:45 +0000 (01:46 +0000)]
Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev
am: 59a91c04cc

Change-Id: I73c136f6ef87a4f56b65d615fe83595d055a47b8

7 years agoAAPT: Fix feature split generation of ID resources
Adam Lesinski [Thu, 4 Aug 2016 01:46:43 +0000 (01:46 +0000)]
AAPT: Fix feature split generation of ID resources
am: 4d219da3c4

Change-Id: I0cc7e1174020e4bd813b4442e2c35fdc2f9513fd

7 years agodocs: Updated wording of callout describing device opt-out options. am: b48909ed52...
Kevin Hufnagle [Thu, 4 Aug 2016 01:46:39 +0000 (01:46 +0000)]
docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f
am: 6c955db797

Change-Id: Ie9ad8fc0294a758b8aaf48a13aad0f9fb9c74b72

7 years agoMerge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs...
Joe Fernandez [Thu, 4 Aug 2016 01:44:09 +0000 (01:44 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614
am: 2500e4a1c1

Change-Id: Icbd80abc6cba4eed94455e1690d3d5412f76798c

7 years agocherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am...
Joe Fernandez [Thu, 4 Aug 2016 01:44:06 +0000 (01:44 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50
am: 42e485c8d2

Change-Id: I7e39bf6a506b5e0d11c290e4b5bf5deca2f92600

7 years agoMerge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am...
Kevin Hufnagle [Thu, 4 Aug 2016 01:44:04 +0000 (01:44 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732
am: bc10c93a2b

Change-Id: Ie66ee359091e5b487b273ae7a9ee55fc25129120

7 years agodocs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772
Kevin Hufnagle [Thu, 4 Aug 2016 01:43:37 +0000 (01:43 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772
am: 6ed6297b5c

Change-Id: I4902bd5d4c134a5f0fca19f61e501acfa2849574

7 years agodocs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f...
Kevin Hufnagle [Thu, 4 Aug 2016 01:43:03 +0000 (01:43 +0000)]
docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f am: ebd455b077
am: 22f5b5c5d4

Change-Id: Ib93c1c3272df56969af481ca193b253698fcef55

7 years agoMerge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev
Winson [Thu, 4 Aug 2016 01:32:54 +0000 (01:32 +0000)]
Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev
am: 96e80573e0

Change-Id: I299117740dfcc021a0fb8e1cee0630f545447ba3

7 years agoEnsuring that the dock state is opposite of the nav bar.
Winson [Thu, 4 Aug 2016 01:32:51 +0000 (01:32 +0000)]
Ensuring that the dock state is opposite of the nav bar.
am: c54c748ede

Change-Id: Ic02f30251b1b2d0633928f45ff78a3fdb0227b88

7 years agoMerge "Add historical logging to settings provider" into nyc-mr1-dev
Svetoslav Ganov [Thu, 4 Aug 2016 01:32:45 +0000 (01:32 +0000)]
Merge "Add historical logging to settings provider" into nyc-mr1-dev
am: 060f882035

Change-Id: I8e7734958e2915d157804296fb1d947b45f77926

7 years agoAdd historical logging to settings provider
Svetoslav Ganov [Thu, 4 Aug 2016 01:32:43 +0000 (01:32 +0000)]
Add historical logging to settings provider
am: a340bfd7a1

Change-Id: Ifc8b6fb4c109e570f2698c27e3c1dba74da300ef

7 years agoMerge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 01:27:33 +0000 (01:27 +0000)]
Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev

7 years agodocs: Updated wording of callout describing device opt-out options. am: b48909ed52
Kevin Hufnagle [Thu, 4 Aug 2016 01:23:54 +0000 (01:23 +0000)]
docs: Updated wording of callout describing device opt-out options. am: b48909ed52
am: bdbe6fd94f

Change-Id: Id995adadf9dab72a2c5bc70a96a82220937bc7fe

7 years agoMerge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs...
Joe Fernandez [Thu, 4 Aug 2016 01:14:48 +0000 (01:14 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85
am: 6ad22ca614

Change-Id: I458b83999db483a628a2d33a4f3a4037c6f8b7be

7 years agocherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462
Joe Fernandez [Thu, 4 Aug 2016 01:14:43 +0000 (01:14 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462
am: 337279df50

Change-Id: Id7cc9a79f3f306df0aab10921c9b05809763293f

7 years agoMerge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am...
Joe Fernandez [Thu, 4 Aug 2016 01:14:37 +0000 (01:14 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28
am: 0af74fa732

Change-Id: Ie793990d142720d4d901b4e550446cce880d1a36

7 years agodocs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621
Kevin Hufnagle [Thu, 4 Aug 2016 01:13:52 +0000 (01:13 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621
am: a007a4d772

Change-Id: Ia081e1e0be8059188b617e68b17ea34b4d8c409e

7 years agodocs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f
Kevin Hufnagle [Thu, 4 Aug 2016 01:13:21 +0000 (01:13 +0000)]
docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f
am: ebd455b077

Change-Id: Id17e778bbd197afbf9c16a85ef9756358fbb27f4

7 years agoMerge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 01:05:09 +0000 (01:05 +0000)]
Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev

7 years agodocs: Updated wording of callout describing device opt-out options.
Kevin Hufnagle [Thu, 4 Aug 2016 01:03:32 +0000 (01:03 +0000)]
docs: Updated wording of callout describing device opt-out options.
am: b48909ed52

Change-Id: I120725cdb7304e037bc72da73d56fbf901bfe9aa

7 years agoresolve merge conflicts of b29a938c to nyc-dev am: 473738d6d3
Kevin Hufnagle [Thu, 4 Aug 2016 01:03:27 +0000 (01:03 +0000)]
resolve merge conflicts of b29a938c to nyc-dev am: 473738d6d3
am: 11d8a4c49e

Change-Id: I904b0fb058a873289f8ca5d712bd8e2ac7d46cb8

7 years agoMerge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
Joe Fernandez [Thu, 4 Aug 2016 00:57:22 +0000 (00:57 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
am: 51a582fa85

Change-Id: I8be83bf47ae26a6bf9d0f812265c91133be40be3

7 years agocherry-pick from nyc-dev: docs: Add ARC documentation TOC file
Joe Fernandez [Thu, 4 Aug 2016 00:57:20 +0000 (00:57 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file
am: 712c053462

Change-Id: I113c2c5b9391488eedf743220f6ef4c5ec283d6c

7 years agoMerge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
Kevin Hufnagle [Thu, 4 Aug 2016 00:57:16 +0000 (00:57 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
am: d6f1d8ea28

Change-Id: I222fa49789c2f2baac7ff2296617052c9924a328

7 years agodocs: Migrated "Android Runtime on Chrome" pages to DAC
Kevin Hufnagle [Thu, 4 Aug 2016 00:57:14 +0000 (00:57 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC
am: 684d849621

Change-Id: Ic5e11fdcd44ce86f901cc22954192d79283bca93

7 years agoMerge "Add historical logging to settings provider" into nyc-mr1-dev
Svetoslav Ganov [Thu, 4 Aug 2016 00:57:09 +0000 (00:57 +0000)]
Merge "Add historical logging to settings provider" into nyc-mr1-dev

7 years agodocs: Added page on DAC describing ARC manifest file considerations.
Kevin Hufnagle [Thu, 4 Aug 2016 00:56:42 +0000 (00:56 +0000)]
docs: Added page on DAC describing ARC manifest file considerations.
am: 178caa888f

Change-Id: I68b8395dc90245ac7db6892f86b036d2b88ad96e

7 years agoresolve merge conflicts of b29a938c to nyc-dev
Joe Fernandez [Thu, 4 Aug 2016 00:56:39 +0000 (00:56 +0000)]
resolve merge conflicts of b29a938c to nyc-dev
am: 473738d6d3

Change-Id: I49bf89f5ed1696ec85c6b15559a97df2a9bcae04

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 00:54:37 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 00:39:16 +0000 (17:39 -0700)]
Import translations. DO NOT MERGE

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

7 years agodocs: Updated wording of callout describing device opt-out options.
Kevin Hufnagle [Thu, 4 Aug 2016 00:38:27 +0000 (17:38 -0700)]
docs: Updated wording of callout describing device opt-out options.

Bug: 30204612
Change-Id: I80b0a6840da6ca7310e626cec66717c3e1372403

7 years agoMerge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev
Adam Lesinski [Thu, 4 Aug 2016 00:19:28 +0000 (00:19 +0000)]
Merge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev
am: 1584d5d6e2

Change-Id: I9622a35e22baa4f0204527948e967a2de9ba969b

7 years agoResourcesManager: Return null on failure to create Resources
Adam Lesinski [Thu, 4 Aug 2016 00:19:23 +0000 (00:19 +0000)]
ResourcesManager: Return null on failure to create Resources
am: 53fafdfbe7

Change-Id: I47c891d2c21c2ba95cc05d4972332ea128b2d444

7 years agoresolve merge conflicts of b29a938c to nyc-dev
Kevin Hufnagle [Thu, 4 Aug 2016 00:18:15 +0000 (17:18 -0700)]
resolve merge conflicts of b29a938c to nyc-dev

Change-Id: I840d069b8ffab03b0a7c1fc73ba7eae485c80abb

7 years agoMerge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 00:08:20 +0000 (00:08 +0000)]
Merge "ResourcesManager: Return null on failure to create Resources" into nyc-mr1-dev

7 years agoMerge "docs: Add ARC documentation TOC file" into nyc-dev am: 7eb9f10fec
Joe Fernandez [Wed, 3 Aug 2016 23:55:47 +0000 (23:55 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 7eb9f10fec
am: ed500356fa

Change-Id: Ia43762320be7a3bf1a0b7696d1aa64083f2ee193

7 years agodocs: Add ARC documentation TOC file am: a117b34777
Joe Fernandez [Wed, 3 Aug 2016 23:54:52 +0000 (23:54 +0000)]
docs: Add ARC documentation TOC file am: a117b34777
am: 60e9bc98f9

Change-Id: I45be0c8e3ad1b2c117779740f6d925e58fe99e58

7 years agoAAPT: Fix feature split generation of ID resources
Adam Lesinski [Wed, 3 Aug 2016 22:40:19 +0000 (15:40 -0700)]
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

7 years agoMerge "docs: Added page on DAC describing ARC manifest file considerations." into...
Joe Fernandez [Wed, 3 Aug 2016 23:54:03 +0000 (23:54 +0000)]
Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev am: 4c273d1ffe
am: 41ab38815a

Change-Id: Ia806c5e2ad78ee467d4b45379fafaef27773b4d1

7 years agodocs: Added page on DAC describing ARC manifest file considerations. am: 97a3d3c3a6
Kevin Hufnagle [Wed, 3 Aug 2016 23:53:36 +0000 (23:53 +0000)]
docs: Added page on DAC describing ARC manifest file considerations. am: 97a3d3c3a6
am: 9f9f99427d

Change-Id: I8418811131f1c412620d688ef424829a11bacbd4

7 years agoMerge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev am:...
Joe Fernandez [Wed, 3 Aug 2016 23:53:11 +0000 (23:53 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev am: 369246377a
am: 5433326763

Change-Id: Ia6e4e725d4d586da71cac5201633d6498f20a8f2

7 years agodocs: Migrated "Android Runtime on Chrome" pages to DAC am: 9cd48bb447
Kevin Hufnagle [Wed, 3 Aug 2016 23:52:45 +0000 (23:52 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC am: 9cd48bb447
am: f18cb6894a

Change-Id: Iedb399d0fbffee0c38b033aa9c1b154af3a6a402

7 years agoMerge "docs: Add ARC documentation TOC file" into nyc-dev
Joe Fernandez [Wed, 3 Aug 2016 23:43:38 +0000 (23:43 +0000)]
Merge "docs: Add ARC documentation TOC file" into nyc-dev
am: 7eb9f10fec

Change-Id: I1ca98164cf541692cb2b008f181025036b3ee1a3

7 years agodocs: Add ARC documentation TOC file
Joe Fernandez [Wed, 3 Aug 2016 23:43:32 +0000 (23:43 +0000)]
docs: Add ARC documentation TOC file
am: a117b34777

Change-Id: Iba4a71217a0932b13dafc614bf40e479348b099b

7 years agoMerge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs
Joe Fernandez [Wed, 3 Aug 2016 23:42:24 +0000 (23:42 +0000)]
Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs

7 years agoMerge "docs: Added page on DAC describing ARC manifest file considerations." into...
Kevin Hufnagle [Wed, 3 Aug 2016 23:42:12 +0000 (23:42 +0000)]
Merge "docs: Added page on DAC describing ARC manifest file considerations." into nyc-dev
am: 4c273d1ffe

Change-Id: I20554bf7a10f13fdb288b9bc3ce3aeb3aa63cacc

7 years agodocs: Added page on DAC describing ARC manifest file considerations.
Kevin Hufnagle [Wed, 3 Aug 2016 23:41:29 +0000 (23:41 +0000)]
docs: Added page on DAC describing ARC manifest file considerations.
am: 97a3d3c3a6

Change-Id: I592b2dc213333f5fe976e64b0f043ad0d2264109

7 years agoMerge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev
Kevin Hufnagle [Wed, 3 Aug 2016 23:40:43 +0000 (23:40 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-dev
am: 369246377a

Change-Id: I95265cb968c1325b089a75c2372471472793cb05

7 years agoEnsuring that the dock state is opposite of the nav bar.
Winson [Wed, 3 Aug 2016 23:25:20 +0000 (16:25 -0700)]
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

7 years agocherry-pick from nyc-dev: docs: Add ARC documentation TOC file
Joe Fernandez [Tue, 2 Aug 2016 00:25:17 +0000 (00:25 +0000)]
cherry-pick from nyc-dev: docs: Add ARC documentation TOC file

Bug: 30114799
Change-Id: I4884bf4a39ae99e661365040d5b34d5b8e2d2ea2
Original-Change-Id: Ib4e3c5b255c9e1e9c2894b3703deb1d38f252fba

7 years agoMerge "Eliminate next-alarm-clock broadcast flapping" into nyc-mr1-dev
Christopher Tate [Wed, 3 Aug 2016 23:39:01 +0000 (23:39 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-mr1-dev
am: 073cf6e537

Change-Id: I51410e786e91a036f64774cb91f8a0c4905a3a45

7 years agoEliminate next-alarm-clock broadcast flapping
Christopher Tate [Wed, 3 Aug 2016 23:38:58 +0000 (23:38 +0000)]
Eliminate next-alarm-clock broadcast flapping
am: 76389c00d3

Change-Id: I79100c928eb1dd2de43a37359530e8fabcae3ba7

7 years agodocs: Migrated "Android Runtime on Chrome" pages to DAC
Kevin Hufnagle [Wed, 3 Aug 2016 23:38:54 +0000 (23:38 +0000)]
docs: Migrated "Android Runtime on Chrome" pages to DAC
am: 9cd48bb447

Change-Id: Ibcde96f750154e16c5bbc795f883aca7d37449d8

7 years agoMerge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs
Joe Fernandez [Wed, 3 Aug 2016 23:35:23 +0000 (23:35 +0000)]
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs

7 years agoMerge "Eliminate next-alarm-clock broadcast flapping" into nyc-mr1-dev
TreeHugger Robot [Wed, 3 Aug 2016 23:33:52 +0000 (23:33 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-mr1-dev