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

Robert Carr [Tue, 13 Jun 2017 01:36:05 +0000 (01:36 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: aec6b4749a
am: 00c2e52c6f

Change-Id: I119bd9a2828c91c25622e4d2c93e8579bbc63726

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 01:33:46 +0000 (01:33 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 20eb74681f
am: bda5530d2a

Change-Id: I2f2b93c2c06a52fbed7b26ece806c7bc88238527

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 01:30:52 +0000 (01:30 +0000)]

Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: 0ba24ed694" into oc-dr1-dev-plus-aosp
am: fd79a77d7b

Change-Id: Iee648e63d925e4ae1a1df72f9d0fb26b8cf1c5dd

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 01:28:19 +0000 (01:28 +0000)]

Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: f734de79cc" into oc-dr1-dev-plus-aosp
am: f1e10a96b9

Change-Id: I6250095f0522d044b62ae3d660d8446f2107d7cd

commit | commitdiff | tree

Tianjie Xu [Tue, 13 Jun 2017 01:25:33 +0000 (01:25 +0000)]

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546 am: d04d501ce7" into oc-dr1-dev-plus-aosp
am: 1fa1f100a3

Change-Id: I0f0da929e78146408def47e03ae9f2425849d7e9

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 01:23:10 +0000 (01:23 +0000)]

Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: bc168cf9d5" into oc-dr1-dev-plus-aosp
am: e1f07567b5

Change-Id: Id519ecd8009af784e7f4d087c2beca0bc854d9cf

commit | commitdiff | tree

Robert Carr [Tue, 13 Jun 2017 01:13:37 +0000 (01:13 +0000)]

Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: 2fa5800da9" into oc-dr1-dev-plus-aosp
am: 3c63cef6bf

Change-Id: I949b09e52f82ae947789489cff5cffc94d438a68

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am: 5a3998fe38 -s ours
am: ed30217c42 -s ours

Change-Id: If8d06784fb6f699ef8e0bb999d0095ee04eff392

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 01:08:04 +0000 (01:08 +0000)]

Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 938fe5c968" into oc-dr1-dev-plus-aosp
am: 4fabf266b7

Change-Id: I10973ffac696d28d300d00d9261f2d05502c5c00

commit | commitdiff | tree

Robert Carr [Tue, 13 Jun 2017 01:06:32 +0000 (01:06 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc
am: aec6b4749a

Change-Id: Ic8bbda9b2fc76253c70e9f5cd15d6a32b212b50d

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 01:05:09 +0000 (01:05 +0000)]

Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 78c9744f41" into oc-dr1-dev-plus-aosp
am: 8f76d06c94

Change-Id: Ibba2531d1fbf0b440fb19672b60938dd93cd40e2

commit | commitdiff | tree

Marie Janssen [Tue, 13 Jun 2017 01:01:23 +0000 (01:01 +0000)]

Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3 am: 297dbb86fe" into oc-dr1-dev-plus-aosp
am: 1270b399cc

Change-Id: I77469544f4cd29f2393e4310ff83ed1da4d5ecfe

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:57:38 +0000 (00:57 +0000)]

Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: f96c9a0fa2" into oc-dr1-dev-plus-aosp
am: 08b598fcfe

Change-Id: I6dd330a240f1725b59e79111fd3bfc124a3fb897

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 00:54:49 +0000 (00:54 +0000)]

Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: 5ca9d413f8" into oc-dr1-dev-plus-aosp
am: 6c240e311b

Change-Id: If93120172fb811743d876984e2622d09e9c0e1a2

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:54:18 +0000 (00:54 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4
am: 20eb74681f

Change-Id: I9dc34fe898c8ce9f5c1babfa73bf619c0e69a494

commit | commitdiff | tree

Robert Carr [Tue, 13 Jun 2017 00:54:10 +0000 (00:54 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am: 42b3610adc

Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 00:49:47 +0000 (00:49 +0000)]

Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: 7e21054200" into oc-dr1-dev-plus-aosp
am: 4c4cf27212

Change-Id: Ibef05a31f18d50b5460af1c23f676e061ad81e6c

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:49:12 +0000 (00:49 +0000)]

Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: 0ba24ed694" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:48:06 +0000 (00:48 +0000)]

Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5
am: 0ba24ed694

Change-Id: I8a33e050caba8a7f80b64709174a867a50857571

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:37 +0000 (00:47 +0000)]

Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: f734de79cc" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:47:18 +0000 (00:47 +0000)]

Merge "Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546 am: d04d501ce7" into oc-dr1-dev-plus-aosp

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am: e887d21330 -s ours" into oc-dr1-dev-plus-aosp
am: 29f0c7bb81 -s ours

Change-Id: I1d4fd8e29f86269ea51ad1d1f996fcf108649a62

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 00:46:50 +0000 (00:46 +0000)]

Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f
am: f734de79cc

Change-Id: Ie507e44ad423296de9ab545c1afcd881273b30e1

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:46:20 +0000 (00:46 +0000)]

Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: bc168cf9d5" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Tianjie Xu [Tue, 13 Jun 2017 00:46:27 +0000 (00:46 +0000)]

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev am: f40f297546
am: d04d501ce7

Change-Id: Ide407c6ccc5a42c9a57acb1652b19db99bee42a8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:45:55 +0000 (00:45 +0000)]

Merge "Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: 2fa5800da9" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 00:45:32 +0000 (00:45 +0000)]

Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86
am: bc168cf9d5

Change-Id: I5b2320564692df6fa14bfeb49fcf350fc4cb2d9d

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:45:02 +0000 (00:45 +0000)]

Merge "Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev am: c14f46b135" into oc-dr1-dev-plus-aosp
am: 7fbd6a02dd

Change-Id: I3baf62e4e287b3aff3ee2def1becdfe6c795d02f

commit | commitdiff | tree

Robert Carr [Tue, 13 Jun 2017 00:43:56 +0000 (00:43 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc
am: 2fa5800da9

Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours
am: 5a3998fe38 -s ours

Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:41:40 +0000 (00:41 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev
am: bbd7dfc0a4

Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:21 +0000 (00:39 +0000)]

Merge "Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 938fe5c968" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:39:07 +0000 (00:39 +0000)]

Merge "Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4 am: 78c9744f41" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 00:38:29 +0000 (00:38 +0000)]

Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631
am: 938fe5c968

Change-Id: I147dea17afffba890b5bb3108d061bdf4f7c76f7

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:38:04 +0000 (00:38 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev am: bbd7dfc0a4
am: 78c9744f41

Change-Id: I985f319bb1cf6627abef2a7dafd9fafd64309264

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:37:39 +0000 (00:37 +0000)]

Merge "Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3 am: 297dbb86fe" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 00:36:59 +0000 (00:36 +0000)]

Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631 am: 5884f6ce0d
am: 308a19531e

Change-Id: I2db2e50ac8ca7b85429271eb649a2698041d1df0

commit | commitdiff | tree

Marie Janssen [Tue, 13 Jun 2017 00:36:46 +0000 (00:36 +0000)]

Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162 am: 00bce50dc3
am: 297dbb86fe

Change-Id: I630bc69705870d4cd7252da9bc8501c564950393

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:36:12 +0000 (00:36 +0000)]

Merge "Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5 am: f96c9a0fa2" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:36:09 +0000 (00:36 +0000)]

Merge "Improve developer docs for storage APIs." into oc-dev
am: 05b52d8ba5

Change-Id: I282786d353e3dc406c7123daa00d3e7fe43de7bc

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:35:13 +0000 (00:35 +0000)]

Merge "Improve developer docs for storage APIs." into oc-dev am: 05b52d8ba5
am: f96c9a0fa2

Change-Id: Ifef4156412f88e1d7bc3d8bbccaca6d0177c7245

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:34:43 +0000 (00:34 +0000)]

Merge "Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f am: 5ca9d413f8" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:34:49 +0000 (00:34 +0000)]

Merge "resolve merge conflicts of 963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am: 827dfe078f

Change-Id: Ibe3a988346ab28f5e74286d327194e2e9f2a67fd

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 00:33:51 +0000 (00:33 +0000)]

Merge "Don't log all instant app resolutions" into oc-dev
am: 3ef0b8260f

Change-Id: I4ef141816c67957b0302be814315e2e739406c31

commit | commitdiff | tree

Todd Kennedy [Tue, 13 Jun 2017 00:33:45 +0000 (00:33 +0000)]

Merge "Don't log all instant app resolutions" into oc-dev am: 3ef0b8260f
am: 5ca9d413f8

Change-Id: I10e7c59edb955ba537a12bd52f7117b382d46d7f

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:33:14 +0000 (00:33 +0000)]

Merge "Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86 am: 7e21054200" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 00:32:20 +0000 (00:32 +0000)]

Merge changes from topic 'sysui-tooltip' into oc-dev am: 3fbcec5b86
am: 7e21054200

Change-Id: Icfe6bb79c13c6e0ef925f30933f7831978a2886c

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:31:48 +0000 (00:31 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am: e887d21330 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 13 Jun 2017 00:31:02 +0000 (00:31 +0000)]

Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Jun 2017 00:30:24 +0000 (00:30 +0000)]

Merge "Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev am: c14f46b135" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:29:15 +0000 (00:29 +0000)]

Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
am: c14f46b135

Change-Id: Iaab3c2094a3f2e905097f47ed24276cc412d0b93

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours
am: e887d21330 -s ours

Change-Id: Ie236dae37b227cf65c837e0efea1ea1f9e9aa9b3

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7c2a12b658 -s ours

Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 00:26:49 +0000 (00:26 +0000)]

Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am: 71029bf631
am: 5884f6ce0d

Change-Id: I725739aed3207992022aa500bb99072410a9a305

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:24:59 +0000 (00:24 +0000)]

Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev am: f7dc56ecc9
am: de624f3fbb

Change-Id: I0a125a6c00220ba280dca4e0d8ece88202a68afe

commit | commitdiff | tree

Will Brazil [Tue, 13 Jun 2017 00:24:40 +0000 (00:24 +0000)]

Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am: 71029bf631

Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:21:21 +0000 (00:21 +0000)]

Merge "resolve merge conflicts of 8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 13 Jun 2017 00:20:35 +0000 (00:20 +0000)]

Merge "resolve merge conflicts of 963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:14:55 +0000 (00:14 +0000)]

Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
am: f7dc56ecc9

Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be

commit | commitdiff | tree

Tarandeep Singh [Tue, 13 Jun 2017 00:12:02 +0000 (00:12 +0000)]

Merge "SearchView focus should be preserved in split-screen."

commit | commitdiff | tree

Jeff Sharkey [Tue, 13 Jun 2017 00:09:45 +0000 (00:09 +0000)]

Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 13 Jun 2017 00:00:41 +0000 (00:00 +0000)]

Merge "AAPT2: Clean up tests a bit"

commit | commitdiff | tree

Tianjie Xu [Mon, 12 Jun 2017 23:55:23 +0000 (23:55 +0000)]

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am: f40f297546

Change-Id: I06fa703be593348db7eed68e3905929262e43a9c

commit | commitdiff | tree

Robert Carr [Mon, 12 Jun 2017 23:45:37 +0000 (23:45 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am: 42b3610adc

Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 23:41:57 +0000 (23:41 +0000)]

Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 23:38:14 +0000 (23:38 +0000)]

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev

commit | commitdiff | tree

Anthony Chen [Mon, 12 Jun 2017 23:27:48 +0000 (23:27 +0000)]

Merge "Handle night mode for notifications."

commit | commitdiff | tree

Jorim Jaggi [Mon, 12 Jun 2017 23:07:19 +0000 (23:07 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev
am: bbd7dfc0a4

Change-Id: I66814b15777b180596fd91ac8906f9df698a2d19

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 23:01:15 +0000 (23:01 +0000)]

Merge "Attempted fix for navigation bar flicker" into oc-dev

commit | commitdiff | tree

Marie Janssen [Mon, 12 Jun 2017 22:57:58 +0000 (22:57 +0000)]

Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162
am: 00bce50dc3

Change-Id: I4235d63f1c9aeb3be8b276c082d707e20f8c1d9a

commit | commitdiff | tree

Tyler Gunn [Mon, 12 Jun 2017 22:53:17 +0000 (22:53 +0000)]

Merge changes from topic 'ims-handover-api' into oc-dr1-dev am: e15da2649b
am: 0d14298f80

Change-Id: Ic21cc388f95e04d47ef93f522412bccfce49d58e

commit | commitdiff | tree

Marie Janssen [Mon, 12 Jun 2017 22:47:00 +0000 (22:47 +0000)]

Merge "Protect broadcast used in settings for bond cancel"
am: 5cfbbce162

Change-Id: Ieb433bca4189ba3d309b417ed6822e836c9468ed

commit | commitdiff | tree

Tyler Gunn [Mon, 12 Jun 2017 22:46:58 +0000 (22:46 +0000)]

Merge changes from topic 'ims-handover-api' into oc-dr1-dev
am: e15da2649b

Change-Id: I98a44fe768bdffaaaca742b1c9e8e10f42c73a90

commit | commitdiff | tree

Jeff Sharkey [Mon, 12 Jun 2017 22:45:22 +0000 (22:45 +0000)]

Merge "Improve developer docs for storage APIs." into oc-dev
am: 05b52d8ba5

Change-Id: I36dbac981e7a11819bd120c604f491eca11018a4

commit | commitdiff | tree

Jeff Sharkey [Mon, 12 Jun 2017 22:39:20 +0000 (22:39 +0000)]

Merge "Improve developer docs for storage APIs." into oc-dev

commit | commitdiff | tree

Marie Janssen [Mon, 12 Jun 2017 22:36:05 +0000 (22:36 +0000)]

Merge "Protect broadcast used in settings for bond cancel"

commit | commitdiff | tree

Tyler Gunn [Mon, 12 Jun 2017 22:35:38 +0000 (22:35 +0000)]

Merge changes from topic 'ims-handover-api' into oc-dr1-dev

* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 22:17:29 +0000 (22:17 +0000)]

Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers"

commit | commitdiff | tree

Jeff Sharkey [Mon, 12 Jun 2017 22:09:16 +0000 (22:09 +0000)]

Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev am: 3d4c62de10
am: dd96cfc4ef

Change-Id: I02eab4f04913de48c182176da6559fb14559f459

commit | commitdiff | tree

Mady Mellor [Mon, 12 Jun 2017 22:06:46 +0000 (22:06 +0000)]

Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev am: f3f6ddf7cb
am: 7fc5ab55bc

Change-Id: I918dad8f98f4f30329b2462ccffbdff06f5b4b3b

commit | commitdiff | tree

Jeff Sharkey [Mon, 12 Jun 2017 22:00:09 +0000 (22:00 +0000)]

Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev
am: 3d4c62de10

Change-Id: Iea3267aeea3c9633876cc055e45d095e0c5f1306

commit | commitdiff | tree

Mady Mellor [Mon, 12 Jun 2017 21:57:17 +0000 (21:57 +0000)]

Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev
am: f3f6ddf7cb

Change-Id: I0147acff32fb79096617dff8080fab677d6c805e

commit | commitdiff | tree

Todd Kennedy [Mon, 12 Jun 2017 21:57:15 +0000 (21:57 +0000)]

Merge "Don't log all instant app resolutions" into oc-dev
am: 3ef0b8260f

Change-Id: Ibcc839c12fd0c23da254992a7147abb1e08d17cc

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:51:27 +0000 (21:51 +0000)]

Merge "Don't log all instant app resolutions" into oc-dev

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 12 Jun 2017 21:51:10 +0000 (21:51 +0000)]

Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:50:51 +0000 (21:50 +0000)]

Merge "Revert work around clang-tidy segmentation fault."

commit | commitdiff | tree

Jeff Sharkey [Mon, 12 Jun 2017 21:50:33 +0000 (21:50 +0000)]

Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev

commit | commitdiff | tree

Mady Mellor [Mon, 12 Jun 2017 21:48:38 +0000 (21:48 +0000)]

Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 66c8f60eb7 -s ours
am: 3e735ea914 -s ours

Change-Id: I279a9d403677327a42a993879f5c2fa4aa97a098

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:42:50 +0000 (21:42 +0000)]

Merge changes from topic 'sysui-tooltip' into oc-dev

* changes:
Pass window token when creating a tooltip popup
Revert "Use a PopupWindow to show tooltips"

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 12 Jun 2017 21:39:35 +0000 (21:39 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fe84caad61 -s ours am: 6e96950a37 -s ours"

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:38:56 +0000 (21:38 +0000)]

Merge "In the stopping/shutdown state return unlock state of the user key"

commit | commitdiff | tree

Tarandeep Singh [Mon, 12 Jun 2017 19:45:57 +0000 (12:45 -0700)]

SearchView focus should be preserved in split-screen.

SearchView's focus should be preserved when entering or exiting
split-screen mode.

Fixes: 31444175
Test: Verified toggling split-screen preserves the focus.
Change-Id: If3a11a6877b4d091ac0559a5cc8775eef071de40

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fe84caad61 -s ours
am: 6e96950a37 -s ours

Change-Id: Ic1e97fa2a8b271391c9e98d37929edc1fc06a9ed

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:34:21 +0000 (21:34 +0000)]

Merge "Deprecate screen brightness boost detection."

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 66c8f60eb7 -s ours

Change-Id: I16ea34198d95d7da16a3a07cf0da1aa9b2b3304e

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: fe84caad61 -s ours

Change-Id: Ia5bf5f5b4f2534adf8ea60557494263f1eaef51b

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:24:43 +0000 (21:24 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Jun 2017 21:24:10 +0000 (21:24 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Anthony Chen [Mon, 10 Apr 2017 23:07:58 +0000 (16:07 -0700)]

Handle night mode for notifications.

When the system detects a night mode change, it will reload the
resources and relayout the notifications.

Also, allow the text in the Notification to take night mode into
account. Add configuration to allow Android Auto embedded to not tint
certain elements of the UI.

Test: booted on phone and Android Auto headunit
Bug: 33210494
Change-Id: I261813e5795b047bdfc4f77b88e1b01cc72e3216