git.osdn.net Git - android-x86/frameworks-base.git/log

Dirk Dougherty [Tue, 23 Aug 2016 16:18:51 +0000 (16:18 +0000)]

Merge "Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe am: 1dba7ddf3a" into cw-f-dev
am: 4e421445b0

Change-Id: I14ae49bce2dad03dd334a11b4f20f1c0a785bd0a

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 16:18:47 +0000 (16:18 +0000)]

Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe am: 1dba7ddf3a
am: 643dcbda88

Change-Id: Ie212b1dafd3851a28d66937eded2bcbbf44adc1d

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:56 +0000 (16:13 +0000)]

Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab am: d6ad4f051e" into cw-f-dev
am: 5d653c4771

Change-Id: I81255bcdec7563b1fe9d9ea05bca67cf4a47e291

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:52 +0000 (16:13 +0000)]

Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab am: d6ad4f051e
am: af09673c38

Change-Id: I6ba0266c785d2a58ed14f83da6f029b017846a23

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:42 +0000 (16:13 +0000)]

Merge "Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0 am: 7208e94355" into cw-f-dev
am: b0da43c8f2

Change-Id: I0fbbec474de26929e796de7fc6324389764ac923

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:38 +0000 (16:13 +0000)]

Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0 am: 7208e94355
am: 904fa00b3e

Change-Id: I1d6ae6a7d94f7e3f70af8c5aed16695c21c7012e

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:24 +0000 (16:13 +0000)]

Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0 am: 32d77972d5" into cw-f-dev
am: 9242f396a6

Change-Id: I1df2dbef9fa18c2a8f89ef9d5f79c87fb1d248ec

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:13:19 +0000 (16:13 +0000)]

Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0 am: 32d77972d5
am: a655fe6c9d

Change-Id: I5258c60de002434672ebc7969c426edd548a0c34

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 16:13:01 +0000 (16:13 +0000)]

Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev
am: 529beb2cc5

Change-Id: Icdb0a74c9b11aad86b20250dd67e74627a95dbf5

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 16:12:51 +0000 (16:12 +0000)]

DO NOT MERGE: Add dynamic illuminance hysteresis support
am: 043a57186a

Change-Id: I08c0e87bcbba1964301e53ad0c9615c1e0e5a66d

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 16:12:39 +0000 (16:12 +0000)]

Docs: Adds a redirect to make it easier to access Performance section on DAC. am: 196cb73dbb am: f5c5eb0045 am: 5e1468cdbd
am: b4e27c0d72

Change-Id: I167921c609d3b9535c44f3188eb1ff42016d38a5

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 15:56:14 +0000 (15:56 +0000)]

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f
am: 759c2855e8

Change-Id: I4e70f6d857e76dc66e3b0d10cf9620dc62937b0b

commit | commitdiff | tree

smain@google.com [Tue, 23 Aug 2016 15:56:11 +0000 (15:56 +0000)]

add workaround for annotations dependency conflict with espresso am: eee3518d11
am: b5971ef610

Change-Id: Ie4f93ff85ad67fb048460a49937cbf55db575262

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)]

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
am: 77917a835f

Change-Id: Id3b88a94a23de579c20757f038dd83c0645e67bc

commit | commitdiff | tree

smain@google.com [Tue, 23 Aug 2016 15:47:14 +0000 (15:47 +0000)]

add workaround for annotations dependency conflict with espresso
am: eee3518d11

Change-Id: I8a609f9f542e2955efe333c13c065e00836c87ab

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:47:03 +0000 (15:47 +0000)]

Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a -s ours am: ce0856f702 am: 41d1827fd3 am: a7025c283c
am: 547d52ca3f

Change-Id: I1776f6daaa1b7f2fd7301bfbb3686357acb413da

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:46:59 +0000 (15:46 +0000)]

Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb -s ours am: f159feff98 am: ade6f4df5b am: 634aafc181
am: 0063bf03c9

Change-Id: I08f2820b4d3df2f01b085799b1dce9693f740a2d

commit | commitdiff | tree

Sudheer Shanka [Tue, 23 Aug 2016 15:46:52 +0000 (15:46 +0000)]

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c -s ours am: e49de5e073 am: 105453e170 am: 8887e258a9
am: 3cf87ce75e

Change-Id: I69bd46bc44c512ce09370116a5d75bcfd08e495b

commit | commitdiff | tree

Amith Yamasani [Tue, 23 Aug 2016 15:46:46 +0000 (15:46 +0000)]

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours am: f705730667 am: d09a6aa0f0 am: 110bd114a8
am: 7136384209

Change-Id: I64227c17513e70615bd7e544e1e3e00fa38555e5

commit | commitdiff | tree

Sudheer Shanka [Tue, 23 Aug 2016 15:46:39 +0000 (15:46 +0000)]

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd942 am: f1e0a4a60c am: 3cf8ad97d0
am: 80533d81bd

Change-Id: Ia237d5a56a46cfd6d968f0d88989fdaeae10d792

commit | commitdiff | tree

Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev

commit | commitdiff | tree

Amith Yamasani [Tue, 23 Aug 2016 15:35:10 +0000 (15:35 +0000)]

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb9441 am: ac9bb3886d am: 250a509a68
am: 9b3f1e26e0

Change-Id: I72b1878607419e2374e15cd5e6b23b5fdec335fe

commit | commitdiff | tree

Svetoslav Ganov [Tue, 23 Aug 2016 15:34:59 +0000 (15:34 +0000)]

Add resource based mechanism to grant default permissions am: d44d46aa50 am: fb53efd8f3
am: eb36e353a6

Change-Id: I9b635e29e7707e03952adf2d657e275eb81147e0

commit | commitdiff | tree

Rob Carr [Tue, 23 Aug 2016 15:34:50 +0000 (15:34 +0000)]

Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev am: 7ae506260e
am: f40e1533b5

Change-Id: Ide42f202a2bd4ae30e7bc7a8471818751e9962b9

commit | commitdiff | tree

Robert Carr [Tue, 23 Aug 2016 15:34:42 +0000 (15:34 +0000)]

Only allow focused window to select seamless rotation. am: 828ec3dc51
am: d2bacdaf6d

Change-Id: I1c3a083f34c224f04343cbd1ae390068c686cde8

commit | commitdiff | tree

Dianne Hackborn [Tue, 23 Aug 2016 15:34:34 +0000 (15:34 +0000)]

Merge "Fix issue #30929080: Default Assist app is set to None..." into nyc-mr1-dev am: d6ece3e175
am: ddca04dcbe

Change-Id: Idefe2cc12a7ad4f79ead642bd041bdd09033d7b3

commit | commitdiff | tree

Dianne Hackborn [Tue, 23 Aug 2016 15:25:00 +0000 (15:25 +0000)]

Fix issue #30929080: Default Assist app is set to None... am: e9563659a5
am: 5cb766a9cd

Change-Id: Ida55c001bd6f4ec0be8235b88fb806a617ed15cc

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:57 +0000 (15:24 +0000)]

Merge "Allow permission group updates" into nyc-mr1-dev am: ee2df0390e
am: a09f3f28ef

Change-Id: I2ef7ea000d0cc65becb40a8ecdd9d1859758c944

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:53 +0000 (15:24 +0000)]

Allow permission group updates am: 21bd9b824f
am: 873b0f563e

Change-Id: I387ffcb88341a112ff8a1aff3b38b32b4b65e382

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:48 +0000 (15:24 +0000)]

Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev am: 0060d6eda1
am: 5cc6bf0ead

Change-Id: If8de2f5e7751ec1e65b7bdb499ecde0037fbec9b

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 15:24:44 +0000 (15:24 +0000)]

Don't call into pkg mgr svc w/ lock held am: f29d07a62a
am: 76a12e177c

Change-Id: Ic1f21fd64990a282375be7709aba79297c9dd6f9

commit | commitdiff | tree

Tenghui Zhu [Tue, 23 Aug 2016 15:15:16 +0000 (15:15 +0000)]

Merge "Correctly report the transparent region" into nyc-mr1-dev am: f05765e3c4
am: 52feb6b956

Change-Id: I746a21537ec34285fda505a5919740ab04693b3d

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 23 Aug 2016 15:15:06 +0000 (15:15 +0000)]

Correctly report the transparent region am: f8da30dc65
am: 94a2f7e6fd

Change-Id: Ice979b549a74f1e8e59210f2b7c7e5a6f141b9f6

commit | commitdiff | tree

Salvador Martinez [Tue, 23 Aug 2016 15:14:54 +0000 (15:14 +0000)]

Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 09b64ade22
am: 0c216301b6

Change-Id: Ic534d6c68c3b43d7b9bd811e257abb695d7c1874

commit | commitdiff | tree

Salvador Martinez [Tue, 23 Aug 2016 15:13:37 +0000 (15:13 +0000)]

Prevent wifi icon from disappearing am: 823cd0e35a
am: aebce41a88

Change-Id: Ic05c1f77725904011e3cf5db44accb7c9847eefa

commit | commitdiff | tree

Rob Carr [Tue, 23 Aug 2016 15:13:04 +0000 (15:13 +0000)]

Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev am: b19915bea8
am: b97dc0a5a8

Change-Id: I3d27d8ae4e25fdb1977e6c57ee02aa80b3a8a4ef

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:49 +0000 (15:10 +0000)]

Merge "Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe am: 1dba7ddf3a" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:33 +0000 (15:10 +0000)]

Merge "Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab am: d6ad4f051e" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:22 +0000 (15:10 +0000)]

Merge "Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0 am: 7208e94355" into cw-f-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 23 Aug 2016 15:10:09 +0000 (15:10 +0000)]

Merge "Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0 am: 32d77972d5" into cw-f-dev

commit | commitdiff | tree

Dirk Dougherty [Tue, 23 Aug 2016 15:09:15 +0000 (15:09 +0000)]

Doc change: updates for final N landing page and related resources. am: b0ca00431f am: b78a9bc5fe
am: 1dba7ddf3a

Change-Id: I21b0522b626433fa932618092b97f42acf108f6d

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:09:12 +0000 (15:09 +0000)]

Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004 am: e5036b3cab
am: d6ad4f051e

Change-Id: Ic8ad057a85b59e3140881b4deccfb0c0add24960

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:09:10 +0000 (15:09 +0000)]

Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986 am: 2663c419c0
am: 7208e94355

Change-Id: I04ef62e6851ee429fbc2607beb54a54b6a4120a4

commit | commitdiff | tree

Julius D'souza [Tue, 23 Aug 2016 15:09:08 +0000 (15:09 +0000)]

Merge "DO NOT MERGE: Add dynamic illuminance hysteresis support" into cw-f-dev

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:09:07 +0000 (15:09 +0000)]

Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac am: c02c6b8fb0
am: 32d77972d5

Change-Id: Iccae3409ae8a7797ebd8ffa67aad496f51a890c7

commit | commitdiff | tree

Tenghui Zhu [Tue, 23 Aug 2016 15:03:39 +0000 (15:03 +0000)]

Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev am: 5cb0c13f76
am: d4f839c477

Change-Id: Iba7c42c3284b1b4b8c3df90c82ce24723d3dfba3

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 23 Aug 2016 15:03:33 +0000 (15:03 +0000)]

Update the javaDoc for VectorDrawable and AnimatedVectorDrawable am: d64255f61d
am: 1c06a4dcc7

Change-Id: I936e99996d2b075d4c7ec12b7ed45dffd814e60c

commit | commitdiff | tree

Fan Zhang [Tue, 23 Aug 2016 15:03:29 +0000 (15:03 +0000)]

Merge "Update navup button content description when it's menu." into nyc-mr1-dev am: bf1d4cae3b
am: ab19598584

Change-Id: I51685602784ced9309d338c3864ef7b45d751a3f

commit | commitdiff | tree

Fan Zhang [Tue, 23 Aug 2016 15:03:24 +0000 (15:03 +0000)]

Update navup button content description when it's menu. am: c10db985f3
am: 17dc1ad151

Change-Id: I8914aa451a545ba1e6f9999eec9deaedbf796e80

commit | commitdiff | tree

Steve McKay [Tue, 23 Aug 2016 15:03:19 +0000 (15:03 +0000)]

Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am: 8499c13740
am: a902d61eb6

Change-Id: I2940f8700c71a29ded2a68d43a3845e03e0b7c4e

commit | commitdiff | tree

David Friedman [Tue, 23 Aug 2016 15:00:17 +0000 (15:00 +0000)]

Docs: Adds a redirect to make it easier to access Performance section on DAC. am: 196cb73dbb am: f5c5eb0045
am: 5e1468cdbd

Change-Id: I5e81ab82e8e3e9c321b57d31333c4a40283e86ba

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:00:15 +0000 (15:00 +0000)]

Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a -s ours am: ce0856f702 am: 41d1827fd3
am: a7025c283c

Change-Id: Id53a357acd6b5ac900963d216aaf441471991f3a

commit | commitdiff | tree

Jim Miller [Tue, 23 Aug 2016 15:00:13 +0000 (15:00 +0000)]

Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb -s ours am: f159feff98 am: ade6f4df5b
am: 634aafc181

Change-Id: I17a1313244d56f6e416f5a0252ee3f6681e19763

commit | commitdiff | tree

Sudheer Shanka [Tue, 23 Aug 2016 15:00:11 +0000 (15:00 +0000)]

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c -s ours am: e49de5e073 am: 105453e170
am: 8887e258a9

Change-Id: Ic9dfa00be5c10ab4d09e55587fa25f8b88c0bbe2

commit | commitdiff | tree

Amith Yamasani [Tue, 23 Aug 2016 15:00:08 +0000 (15:00 +0000)]

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours am: f705730667 am: d09a6aa0f0
am: 110bd114a8

Change-Id: Ia23820f580ae6fd4345e6fe4bd844b33e2459907

commit | commitdiff | tree

Steve McKay [Tue, 23 Aug 2016 14:57:14 +0000 (14:57 +0000)]

Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev am: 8499c13740
am: 477c383cea

Change-Id: I876dfc2a08d3890ea02eb943c40d4769f5cf5e8a

commit | commitdiff | tree

Steve McKay [Tue, 23 Aug 2016 14:57:04 +0000 (14:57 +0000)]

DO NOT MERGE: Treat unknown tooltype as touch. am: 0c28f3bda3
am: 6c06272a12

Change-Id: Ie67b77b846c2bdc7655970c23beb725ae9adc70d

commit | commitdiff | tree

Sungmin Choi [Tue, 23 Aug 2016 14:56:56 +0000 (14:56 +0000)]

Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev am: 156d897f2e
am: 9d5514c81a

Change-Id: Ib72e47eaa6b9d7e5fa08f9df6c3b93c161d149a5

commit | commitdiff | tree

Sungmin Choi [Tue, 23 Aug 2016 14:56:52 +0000 (14:56 +0000)]

telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network am: fd80d5482a
am: c461691675

Change-Id: I793a3fe8baf60cdc29493c8cb9623d79a79bc120

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 14:56:48 +0000 (14:56 +0000)]

Merge "Fix roam icon issues in Austria" into nyc-mr1-dev am: 914354f334
am: f3f5022a7f

Change-Id: I12a8728a854d9b998c42ffa4c945b8b9ac2aa925

commit | commitdiff | tree

Sungmin Choi [Tue, 23 Aug 2016 14:53:52 +0000 (14:53 +0000)]

Fix roam icon issues in Austria am: f8912fc489
am: d1c8ab5566

Change-Id: I4827213efac41fa215c7096e666328b58d127e2e

commit | commitdiff | tree

Chong Zhang [Tue, 23 Aug 2016 14:53:39 +0000 (14:53 +0000)]

Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev am: f9f8e82045
am: ac2c6b307e

Change-Id: I333cf8facd448ac3993713bdd315841c7d249a0b

commit | commitdiff | tree

Chong Zhang [Tue, 23 Aug 2016 14:53:29 +0000 (14:53 +0000)]

Make sure surface control is really valid before giving it to client am: 7581cddf25
am: d3edf1e799

Change-Id: I25cb7bb6a3f87795af75d637bf98b682197f3627

commit | commitdiff | tree

Raph Levien [Tue, 23 Aug 2016 14:53:16 +0000 (14:53 +0000)]

Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev am: e7ab3e1650
am: ddc50bb7d9

Change-Id: I8d78147b79e57a69dac679f4e571f3dc815932b1

commit | commitdiff | tree

Raph Levien [Tue, 23 Aug 2016 14:53:06 +0000 (14:53 +0000)]

Update lint check to accommodate new emoji sequences am: 0790ac68bc
am: b1581dbbfd

Change-Id: I17b2989e1ee0477991705d15e0324a449da69c1a

commit | commitdiff | tree

Sudheer Shanka [Tue, 23 Aug 2016 14:51:45 +0000 (14:51 +0000)]

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd942 am: f1e0a4a60c
am: 3cf8ad97d0

Change-Id: Ibf31e9162d42caa24f9f79b934a461925c194589

commit | commitdiff | tree

Amith Yamasani [Tue, 23 Aug 2016 14:51:43 +0000 (14:51 +0000)]

DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb9441 am: ac9bb3886d
am: 250a509a68

Change-Id: Ic5ed2c9b3b6f7779d59176db169c390a8762cd1b

commit | commitdiff | tree

Svetoslav Ganov [Tue, 23 Aug 2016 14:51:41 +0000 (14:51 +0000)]

Add resource based mechanism to grant default permissions am: d44d46aa50
am: fb53efd8f3

Change-Id: I734a4186b92c4dfed45c0269b6d2419e7971e802

commit | commitdiff | tree

Rob Carr [Tue, 23 Aug 2016 14:51:39 +0000 (14:51 +0000)]

Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev
am: 7ae506260e

Change-Id: I0b1d7c270c421bc1ec77d87b3ed74aa5f27a7b6b

commit | commitdiff | tree

Robert Carr [Tue, 23 Aug 2016 14:51:37 +0000 (14:51 +0000)]

Only allow focused window to select seamless rotation.
am: 828ec3dc51

Change-Id: I617dbf02a81a004a38ec3b1da1381ae0497f64ba

commit | commitdiff | tree

Dianne Hackborn [Tue, 23 Aug 2016 14:51:33 +0000 (14:51 +0000)]

Merge "Fix issue #30929080: Default Assist app is set to None..." into nyc-mr1-dev
am: d6ece3e175

Change-Id: Ic07c8b9212422afca01e28682608c577594d5931

commit | commitdiff | tree

Dianne Hackborn [Tue, 23 Aug 2016 14:51:30 +0000 (14:51 +0000)]

Fix issue #30929080: Default Assist app is set to None...
am: e9563659a5

Change-Id: I738c1126ffbffaa904e7d4533347a218a0ccecdd

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 14:46:29 +0000 (14:46 +0000)]

Merge "Allow permission group updates" into nyc-mr1-dev
am: ee2df0390e

Change-Id: I1c88a2863ddb2a60d94a5a84d49103789b849d42

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 14:46:25 +0000 (14:46 +0000)]

Allow permission group updates
am: 21bd9b824f

Change-Id: I8f938705b6f25b2bd53410f5b496191ec2784a9c

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 14:46:18 +0000 (14:46 +0000)]

Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev
am: 0060d6eda1

Change-Id: Ia8fb43fceea7f13a035a719a969e833b45e99408

commit | commitdiff | tree

Todd Kennedy [Tue, 23 Aug 2016 14:46:12 +0000 (14:46 +0000)]

Don't call into pkg mgr svc w/ lock held
am: f29d07a62a

Change-Id: Iffd22d7e33a0870236576033658d420c22426b97

commit | commitdiff | tree

Tenghui Zhu [Tue, 23 Aug 2016 14:46:02 +0000 (14:46 +0000)]

Merge "Correctly report the transparent region" into nyc-mr1-dev
am: f05765e3c4

Change-Id: I9978bb78a2ccd63ceccbab89bb7c783237c0f97f

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 23 Aug 2016 14:45:55 +0000 (14:45 +0000)]

Correctly report the transparent region
am: f8da30dc65

Change-Id: I2fa623c2893a6cea96843f78d46fe753913b6f4d

commit | commitdiff | tree

Salvador Martinez [Tue, 23 Aug 2016 14:45:43 +0000 (14:45 +0000)]

Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am: 09b64ade22

Change-Id: I22142397ad0af75eb29ed2ba2b764f87d34825ca

commit | commitdiff | tree

Randy Pan [Tue, 23 Aug 2016 14:45:26 +0000 (14:45 +0000)]

Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev am: dd056b9422
am: 69f7492184

Change-Id: I6711a9fac55cbc20f8f7f3511200e4f668334752

commit | commitdiff | tree

Randy Pan [Tue, 23 Aug 2016 14:44:20 +0000 (14:44 +0000)]

Deprecate QNS network disable reason BAD_LINK am: 7d82f98b8f
am: 1f7453e79c

Change-Id: I187eac64a1b7b2582a5b0ce2b5d8775bbb1299a9

commit | commitdiff | tree

Makoto Onuki [Tue, 23 Aug 2016 14:44:14 +0000 (14:44 +0000)]

Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev am: 8b47748b9c
am: 9594d78a45

Change-Id: I612522eb78c92f9eb677049aaef61728318256ca

commit | commitdiff | tree

Makoto Onuki [Tue, 23 Aug 2016 14:44:11 +0000 (14:44 +0000)]

Off-load unlocking users onto a worker thread am: 085a05cd86
am: 035cfcd21d

Change-Id: Ie19ee16803beb4f11011ea5833c9a80dc22d82d7

commit | commitdiff | tree

Bill Yi [Tue, 23 Aug 2016 14:44:07 +0000 (14:44 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a6ec65edab -s ours
am: 125d6479a0 -s ours

Change-Id: Ic316efc26417c8915b4531b17d632b5b05a88d62

commit | commitdiff | tree

Bill Yi [Tue, 23 Aug 2016 14:44:04 +0000 (14:44 +0000)]

Import translations. DO NOT MERGE am: 653c88ed61 -s ours
am: 85755a910e -s ours

Change-Id: I7990c75216b72ed76a7fe10aa0ecc590acc2da0e

commit | commitdiff | tree

Salvador Martinez [Tue, 23 Aug 2016 14:43:31 +0000 (14:43 +0000)]

Prevent wifi icon from disappearing
am: 823cd0e35a

Change-Id: I55a99176048dd30b46ae4ea2900b92e929c3a374

commit | commitdiff | tree

Rob Carr [Tue, 23 Aug 2016 14:43:23 +0000 (14:43 +0000)]

Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev
am: b19915bea8

Change-Id: Ie2f4ab820f05ee91b4e0f45f3bfdc24801a44d81

commit | commitdiff | tree

Robert Carr [Tue, 23 Aug 2016 14:43:21 +0000 (14:43 +0000)]

PopupWindow: Be more consistent about Gravity calculation.
am: 798fb79866

Change-Id: Ia7c49dbe2fbe751565d6c8be46586a66c535a148

commit | commitdiff | tree

Tenghui Zhu [Tue, 23 Aug 2016 14:38:50 +0000 (14:38 +0000)]

Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev
am: 5cb0c13f76

Change-Id: I39f5fa1b99680d4d62ee157bdb2e5c65d09e9365

commit | commitdiff | tree

Teng-Hui Zhu [Tue, 23 Aug 2016 14:38:47 +0000 (14:38 +0000)]

Update the javaDoc for VectorDrawable and AnimatedVectorDrawable
am: d64255f61d

Change-Id: I3999edd101b3188139c4dfd80b106820e1c9fdfc

commit | commitdiff | tree

Fan Zhang [Tue, 23 Aug 2016 14:38:41 +0000 (14:38 +0000)]

Merge "Update navup button content description when it's menu." into nyc-mr1-dev
am: bf1d4cae3b

Change-Id: I44c5ebf3d83c707e9e2abb246a70c324d1e32fd4

commit | commitdiff | tree

Fan Zhang [Tue, 23 Aug 2016 14:38:37 +0000 (14:38 +0000)]

Update navup button content description when it's menu.
am: c10db985f3

Change-Id: I1f954904540791d747540e102ce038866675b08a

commit | commitdiff | tree

Steve McKay [Tue, 23 Aug 2016 14:38:31 +0000 (14:38 +0000)]

Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev
am: 8499c13740

Change-Id: Ia3197b91667864b7353d4e047b04fe9dc9d2ed1b

commit | commitdiff | tree

Steve McKay [Tue, 23 Aug 2016 14:38:27 +0000 (14:38 +0000)]

DO NOT MERGE: Treat unknown tooltype as touch.
am: 0c28f3bda3

Change-Id: Idbee59d7450b63735291f5218784c87f762ed19b

commit | commitdiff | tree

Sungmin Choi [Tue, 23 Aug 2016 14:38:21 +0000 (14:38 +0000)]

Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev
am: 156d897f2e

Change-Id: Ia3421b6cbfdf858d2cfb77acd607c239da9497a9

commit | commitdiff | tree

Sungmin Choi [Tue, 23 Aug 2016 14:38:17 +0000 (14:38 +0000)]

telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network
am: fd80d5482a

Change-Id: I2a11a4fecd14cce3362fb3d9e4416df923a7458d

commit | commitdiff | tree

Sanket Padawe [Tue, 23 Aug 2016 14:38:09 +0000 (14:38 +0000)]

Merge "Fix roam icon issues in Austria" into nyc-mr1-dev
am: 914354f334

Change-Id: Ice1d8843cb05a5bd788f14554c863837963c5f78

commit | commitdiff | tree

Sungmin Choi [Tue, 23 Aug 2016 14:38:02 +0000 (14:38 +0000)]

Fix roam icon issues in Austria
am: f8912fc489

Change-Id: I2feb5bb95386316d209031db03dd14ba8b546aaa

commit | commitdiff | tree

Julius D'souza [Mon, 8 Aug 2016 02:08:30 +0000 (19:08 -0700)]

DO NOT MERGE: Add dynamic illuminance hysteresis support

Bug: 18572096

Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97

commit | commitdiff | tree

Bill Yi [Tue, 23 Aug 2016 14:35:25 +0000 (14:35 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8aea3746cd -s ours
am: d6e2c3ff06 -s ours

Change-Id: Ie89dab313c94a48e20d5094acd740ebd7fbcee72