OSDN Git Service
Android Build Merger (Role) [Fri, 30 Jun 2017 17:28:29 +0000 (17:28 +0000)]
Merge "Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev am:
b8a17cde7e" into oc-dr1-dev-plus-aosp
Santos Cordon [Fri, 30 Jun 2017 17:27:25 +0000 (17:27 +0000)]
Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
am:
b8a17cde7e
Change-Id: Ic0fe241ee3bea23816baea9523f89e4845626c68
Santos Cordon [Fri, 30 Jun 2017 17:18:54 +0000 (17:18 +0000)]
Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
am:
b8a17cde7e
Change-Id: Ic21bfaafead58f0c3ce7f0d206de235890636039
Santos Cordon [Fri, 30 Jun 2017 17:09:09 +0000 (17:09 +0000)]
Merge "Always run Virtual Display when in a BootsToVR device." into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 17:02:32 +0000 (17:02 +0000)]
Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev
am:
c8c4056756
Change-Id: I265c53deeb8c756c1480d45d50e0dcb98aa0c250
Adrian Roos [Fri, 30 Jun 2017 17:01:01 +0000 (17:01 +0000)]
Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev
am:
4a51e275db
Change-Id: Ibf1bc449bf63e24ffec1fffc3634d4a4c5e281b8
TreeHugger Robot [Fri, 30 Jun 2017 16:55:16 +0000 (16:55 +0000)]
Merge "AOD: Use keyguard screen rotation when dozing" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 16:54:32 +0000 (16:54 +0000)]
Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev
Bryce Lee [Fri, 30 Jun 2017 16:33:30 +0000 (16:33 +0000)]
Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev
am:
392ac74f37
Change-Id: I9105966db42cf5cc9f0748ddd9121806529a3dd3
Bryce Lee [Fri, 30 Jun 2017 16:32:22 +0000 (16:32 +0000)]
Merge "Add rotation to configuration." into oc-dr1-dev
am:
2050dc66e2
Change-Id: I585507c98972c7b8a2ad07e21bf56c13552d20a4
Jonathan Solnit [Fri, 30 Jun 2017 16:25:20 +0000 (16:25 +0000)]
Merge "Turn off camera lift logging" into oc-dr1-dev
am:
61dd3b8970
Change-Id: Ic55ecd06cf6c713bbcadc3fd9646f880274a6473
Bryce Lee [Fri, 30 Jun 2017 16:17:34 +0000 (16:17 +0000)]
Merge "Always send configuration to client from resize and relayout." into oc-dr1-dev
Bryce Lee [Fri, 30 Jun 2017 16:17:34 +0000 (16:17 +0000)]
Merge "Add rotation to configuration." into oc-dr1-dev
Jonathan Solnit [Fri, 30 Jun 2017 16:11:22 +0000 (16:11 +0000)]
Merge "Turn off camera lift logging" into oc-dr1-dev
Santos Cordon [Wed, 21 Jun 2017 23:03:49 +0000 (16:03 -0700)]
Always run Virtual Display when in a BootsToVR device.
This CL:
1) Moved initialization of the virtual display adapter to happen along
side the default display. On standalone VR devices, a virtual display
is used as the main display for 2D UI so it is necessary that the virtual
display system is ready after PHASE_WAIT_FOR_DEFAULT_DISPLAY.
2) Add knowledge of bootsToVr in Vr2dDisplay, indicating that the device
is a standalone device that boots into VR. This forces Vr2dDisplay to
create the virtualDisplay at PHASE_SYSTEM_SERVICES_READY and never
destroy it (so that the activity stack doesn't go away).
3) Add tests to ensure default display and virtual display startup
sequence doesn't change.
Change-Id: Ie748771abd0b115db3c65a66a4b7a98dd1b28f2e
Bug:
62842592
Test: Start a polaris device for first time, ensure SUW runs with
Virtual display dimentions.
Test: DisplayManagerServiceTest.java
Jason Monk [Fri, 30 Jun 2017 15:23:52 +0000 (15:23 +0000)]
Merge "Fix test failure" into oc-dr1-dev
am:
a9c3d283df
Change-Id: Ibbec4701dca82d9c271e8ff25d25cbe2df8da816
TreeHugger Robot [Fri, 30 Jun 2017 15:15:40 +0000 (15:15 +0000)]
Merge "Fix test failure" into oc-dr1-dev
Adrian Roos [Fri, 30 Jun 2017 14:38:14 +0000 (14:38 +0000)]
Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev
am:
b4fe9ce703
Change-Id: Iedeab3f2342729224fe79f17665ef6e9f2a65f76
TreeHugger Robot [Fri, 30 Jun 2017 14:31:33 +0000 (14:31 +0000)]
Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev
Bryce Lee [Thu, 29 Jun 2017 21:03:33 +0000 (14:03 -0700)]
Always send configuration to client from resize and relayout.
Previously, the server side would omit reporting new configurations
during resize and relayout if the current configuration matched the
last reported. However, if the last reported came through a resize,
the client side handling would be enqueued as a Handler message. This
leads to the possibility of the client getting a new window frame but
not a new configuration where this is synchronously handled, such as
ViewRootImpl::performTraversals.
To address this issue, we now always send the current configuration
from the server to the client. The client then identifies changes
against its own record of last reported configuration and updates as
appropriate.
This changelist also adds a call to force window relayout during
updateConfiguration, as it's possible this is called after
performTraversals is called or resize is handled, leading to a stale
window frame.
Bug:
24671393
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
temporary logs to detect inconsistencies between measurements
and reported rotation on draw.
Change-Id: I0d5143dfe80400f6a43ce710750f9fc9d4b93f74
Jason Monk [Fri, 30 Jun 2017 13:10:01 +0000 (09:10 -0400)]
Fix test failure
Was the result of 2 CLs merging at the same time that affect the
test.
Test: runtest systemui
Change-Id: I622a9f7163aa5f9830ef9acb90f1bfb3e5f3df5f
Fixes:
63098063
Neil Fuller [Fri, 30 Jun 2017 12:52:21 +0000 (12:52 +0000)]
Merge "Track move of distro installer code" am:
8558d93db8 am:
50a15e7f6e
am:
fb46f6a0b8
Change-Id: I398b9b48447835bc86816187ed5bab4233dcf6e1
Neil Fuller [Fri, 30 Jun 2017 12:45:16 +0000 (12:45 +0000)]
Merge "Track move of distro installer code" am:
8558d93db8
am:
50a15e7f6e
Change-Id: I5295f6e63ac9aafbebaa9870776e0502bf5129d7
Neil Fuller [Fri, 30 Jun 2017 12:38:05 +0000 (12:38 +0000)]
Merge "Track move of distro installer code"
am:
8558d93db8
Change-Id: I2d27a58c21b7b8931b1d058d6a6bc88eeb8f7709
Neil Fuller [Fri, 30 Jun 2017 12:28:23 +0000 (12:28 +0000)]
Merge "Track move of distro installer code"
Jack He [Fri, 30 Jun 2017 10:50:54 +0000 (10:50 +0000)]
Support battery level reporting via Apple VSC (1/2)
am:
266499d9d8 -s ours
Change-Id: Iba054f707eaf71f952ba1185cd9c206453f73831
Jack He [Fri, 30 Jun 2017 10:49:07 +0000 (10:49 +0000)]
Support battery level reporting via Plantronics XEVENT (1/2)
am:
fff37da08d -s ours
Change-Id: I31254fdc92aa4d2c5a08822d680b8e7ff0d77134
Jack He [Wed, 21 Jun 2017 00:09:47 +0000 (17:09 -0700)]
Support battery level reporting via Apple VSC (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
Merged-In: I9f49ea28efdf6de0e751a377d879fe13a47655d5
(cherry picked from commit
679d0bc8f99145d70af0c8006d807b55110fe3b5)
Jack He [Fri, 30 Jun 2017 08:47:28 +0000 (08:47 +0000)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
am:
dfd8618b2d -s ours
Change-Id: I971e1a1523d4716c1ae13bd498687d14d662d7dd
Jack He [Wed, 21 Jun 2017 00:07:40 +0000 (17:07 -0700)]
Support battery level reporting via Plantronics XEVENT (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
Merged-In: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
(cherry picked from commit
0fcbba25b7ac7fd59367c8c9ba3080a3e6ade934)
Jack He [Fri, 30 Jun 2017 06:34:20 +0000 (06:34 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev
am:
41760687fd -s ours
Change-Id: If2ea7309bf4cf1d7df496657eb2e2452082fa04b
Jack He [Fri, 30 Jun 2017 06:27:03 +0000 (06:27 +0000)]
Add APIs to get remote device's battery level (1/2)
am:
2b07bbafa2 -s ours
Change-Id: I9741e078c85b65b160a8e7f2f64d89dd3824d709
Jack He [Thu, 22 Jun 2017 19:56:54 +0000 (12:56 -0700)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
* Per HFP 1.7.1 spec page 102 of 144
EXTRA_HF_INDICATORS_IND_ID should be int
EXTRA_HF_INDICATORS_IND_VALUE should be int
Bug:
35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth
Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
Merged-In: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
(cherry picked from commit
73795440a54a5407284331ac11f8c0f75acd98d6)
TreeHugger Robot [Fri, 30 Jun 2017 06:21:48 +0000 (06:21 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" into oc-dr1-dev
Jack He [Sat, 17 Jun 2017 02:43:58 +0000 (19:43 -0700)]
Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
that remote device's battery level has changed
Bug:
35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
Merged-In: I41051ee25383f5f3a1e505aef6f8c526385f58bd
(cherry picked from commit
1d312bfa78c25e0e1d6ea25b2c027e2efdd5a418)
Albert Chaulk [Fri, 30 Jun 2017 03:27:04 +0000 (03:27 +0000)]
Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
am:
4bf79089c4
Change-Id: I634f874a94e97aadc139e75d241efa4c9e13542a
TreeHugger Robot [Fri, 30 Jun 2017 03:22:45 +0000 (03:22 +0000)]
Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
Jack He [Fri, 30 Jun 2017 02:29:10 +0000 (02:29 +0000)]
Merge "Add strings for battery level info of connected devices" into oc-dr1-dev
am:
e269956acb
Change-Id: Iad81be953573a43e7ff5cffb06af5222f4e67322
TreeHugger Robot [Fri, 30 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Add strings for battery level info of connected devices" into oc-dr1-dev
Sundeep Ghuman [Fri, 30 Jun 2017 01:58:35 +0000 (01:58 +0000)]
Merge "Remove IPC calls from synchronized block." into oc-dr1-dev
am:
6829db0cb6
Change-Id: I0de9ba563c2e84997c5ecb10efa973974191047f
TreeHugger Robot [Fri, 30 Jun 2017 01:50:48 +0000 (01:50 +0000)]
Merge "Remove IPC calls from synchronized block." into oc-dr1-dev
Android Build Merger (Role) [Fri, 30 Jun 2017 01:00:25 +0000 (01:00 +0000)]
Merge "Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439 am:
a8bccb6674" into oc-dr1-dev-plus-aosp
Ricardo Loo [Fri, 30 Jun 2017 00:59:23 +0000 (00:59 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439
am:
a8bccb6674
Change-Id: Ie60b3eb45178fd4f8a6dff3d860f1195ba3a847e
Ricardo Loo [Fri, 30 Jun 2017 00:59:20 +0000 (00:59 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439
am:
824b41d77a
Change-Id: Ie9593ce8239fc8c5f0e8dd40bc513c1edcb849a1
Ricardo Loo [Fri, 30 Jun 2017 00:51:57 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am:
a89dfb5439
Change-Id: Ibaa0fd7bcbb1fa4eb880a53894fbf94d857f334f
Ricardo Loo [Fri, 30 Jun 2017 00:51:55 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am:
a89dfb5439
Change-Id: Ie43f37efa9e268b04dbad09ad04795089de68adf
Ricardo Loo [Fri, 30 Jun 2017 00:44:50 +0000 (00:44 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
Android Build Merger (Role) [Fri, 30 Jun 2017 00:41:13 +0000 (00:41 +0000)]
Merge "Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184 am:
1040b18dc3" into oc-dr1-dev-plus-aosp
Bryce Lee [Thu, 22 Jun 2017 22:29:42 +0000 (15:29 -0700)]
Add rotation to configuration.
Certain activities are dependent on the rotation of the device to
determine layout. In these cases, orientation does not provide enough
details.
This CL adds the field (hidden) to the configuration.
Change-Id: Idb3ba10cb4de8838737c25e92264e6cee224e264
Fixes:
32839232
Test: go/wm-smoke
Chet Haase [Fri, 30 Jun 2017 00:39:54 +0000 (00:39 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184
am:
1040b18dc3
Change-Id: I8add96e5d8817413500e7763afb77715be3ca703
Chet Haase [Fri, 30 Jun 2017 00:39:52 +0000 (00:39 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184
am:
d73f6a985d
Change-Id: I3e9a5533093efe5ecdcc908432ec476f081548f5
Chet Haase [Fri, 30 Jun 2017 00:32:27 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am:
8cdbd6e184
Change-Id: I0d82ace7d340af8f66a6233ce5b474d26595c38f
Chet Haase [Fri, 30 Jun 2017 00:32:26 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am:
8cdbd6e184
Change-Id: Iacf5e069e0e6a2b38a1566f36f81ab8de693e634
TreeHugger Robot [Fri, 30 Jun 2017 00:21:28 +0000 (00:21 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
Makoto Onuki [Fri, 30 Jun 2017 00:19:06 +0000 (00:19 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
am:
09e1fae73f
Change-Id: If7c7fe80a450d0151efeb2ea26e7bfedd6a4a04f
TreeHugger Robot [Fri, 30 Jun 2017 00:08:52 +0000 (00:08 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
Sundeep Ghuman [Fri, 30 Jun 2017 00:05:43 +0000 (00:05 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
am:
635575d579
Change-Id: I2f962bc6b2c2c8eda54ed8d9578922bd67e441dc
Sundeep Ghuman [Thu, 29 Jun 2017 23:56:55 +0000 (23:56 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
Jack He [Wed, 28 Jun 2017 21:17:10 +0000 (14:17 -0700)]
Add strings for battery level info of connected devices
* SystemUI: quick_settings_connected_battery_level
* SettingsLib:
bluetooth_connected_battery_level
bluetooth_connected_no_headset_battery_level
bluetooth_connected_no_a2dp_battery_level
bluetooth_connected_no_headset_no_a2dp_battery_level
Bug:
63027849
Test: make, test using these strings
Change-Id: I9052dad87d2afd30d005d050c6b3bfc4813853df
Evan Laird [Thu, 29 Jun 2017 23:28:06 +0000 (23:28 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
am:
a8abb9d586
Change-Id: I7ae1b22a70a73d761dc4cea6c6892100261394af
TreeHugger Robot [Thu, 29 Jun 2017 23:19:58 +0000 (23:19 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
Christopher Tate [Thu, 29 Jun 2017 22:34:22 +0000 (22:34 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
am:
2de66f7be1
Change-Id: Id453b9477272c8d10738a06626411dfda58cea74
TreeHugger Robot [Thu, 29 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
Hall Liu [Thu, 29 Jun 2017 21:58:22 +0000 (21:58 +0000)]
Merge "Implement cancelDownload and remove appName" am:
9b43ffcf2f am:
4b1acf4421
am:
4c751c865a
Change-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63
Hall Liu [Thu, 29 Jun 2017 21:51:13 +0000 (21:51 +0000)]
Merge "Implement cancelDownload and remove appName" am:
9b43ffcf2f
am:
4b1acf4421
Change-Id: Ic6d19500c335bc40e6d14d009d4d459bf02b06e1
Hall Liu [Thu, 29 Jun 2017 21:45:47 +0000 (21:45 +0000)]
Merge "Implement cancelDownload and remove appName"
am:
9b43ffcf2f
Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
Hall Liu [Thu, 29 Jun 2017 21:33:11 +0000 (21:33 +0000)]
Merge "Implement cancelDownload and remove appName"
Santos Cordon [Thu, 29 Jun 2017 21:31:53 +0000 (21:31 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
am:
67143a8cfc
Change-Id: I9a65c8a9c33ffe4a982d090966654f4e93690c3b
Santos Cordon [Thu, 29 Jun 2017 21:21:42 +0000 (21:21 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
Jonathan Solnit [Thu, 29 Jun 2017 20:05:13 +0000 (13:05 -0700)]
Turn off camera lift logging
Test: Triggered camera lift, confirmed no logging
Bug:
63141065
Change-Id: Ib93fd5885196a9a3055dabb8b956b23d6928cc49
Makoto Onuki [Thu, 29 Jun 2017 21:11:14 +0000 (14:11 -0700)]
Add boot/shutdown timing to sync detailed logging
Bug
63136907
Test: manual test
Change-Id: I141f32f90579e2676af616f21254774d64a37c31
Doris Ling [Thu, 29 Jun 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
am:
18f3adc03a
Change-Id: I04b7160390a4c3cdee6f0355e3aeb0fdee0a4719
TreeHugger Robot [Thu, 29 Jun 2017 20:41:47 +0000 (20:41 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 20:37:53 +0000 (20:37 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev
am:
80139bfc4d
Change-Id: I6d1ad70e691c5ef0712afa79a9c96160b6559cd5
TreeHugger Robot [Thu, 29 Jun 2017 20:31:23 +0000 (20:31 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev
Sundeep Ghuman [Tue, 27 Jun 2017 00:13:00 +0000 (17:13 -0700)]
Move generatePreferenceKey to AccessPointPreference.
This allows it to be reused in the SavedAccessPointsWifiSettings.
Bug: b/
62374459
Test: make -j40 RunSettingsLibRoboTests
Change-Id: Id137f56ceafe461d217c0eee6b571ccfa4eaff1f
Evan Laird [Thu, 29 Jun 2017 18:32:00 +0000 (14:32 -0400)]
Update auto rotate / portrait QS icon
Animations and new icon for auto rotate. No landscape included here.
Test: visual
Bug:
62386498
Change-Id: If2862c24bed78be2110b2d58d1b4326b04b40c9d
Paul McLean [Thu, 29 Jun 2017 19:33:36 +0000 (19:33 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev
am:
f56b57781e
Change-Id: I994d9d6f327a204916fe9145cc6ce9a2b511d307
Hyunyoung Song [Thu, 29 Jun 2017 19:27:30 +0000 (19:27 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev
am:
e54ad58aea
Change-Id: I01b6fd2391e1296546291af5db5a4663e67fae01
TreeHugger Robot [Thu, 29 Jun 2017 19:25:09 +0000 (19:25 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 19:18:52 +0000 (19:18 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev
Android Build Merger (Role) [Thu, 29 Jun 2017 19:07:39 +0000 (19:07 +0000)]
Merge "Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be am:
98b181b25f" into oc-dr1-dev-plus-aosp
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:06:36 +0000 (19:06 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be
am:
98b181b25f
Change-Id: Ic87422062ac28fb51596af2a7665b228b446b98a
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:06:33 +0000 (19:06 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be
am:
a1157b3aa1
Change-Id: I80fac516afe2c7b75fe775d80444a501585bd3b7
Santos Cordon [Tue, 13 Jun 2017 00:57:17 +0000 (17:57 -0700)]
Add ability to turn off VR virtual display functionality.
Add flag to enable/disable virtual displays via the existing
setDisplayProperties API. This makes it possible for the VR system
to turn off virtual displays if necessary after we ship.
Bug:
62546364
Test: Run 'adb shell vr enable-virtual-display [true|false] to toggle while 2d in 3d
runs.
Change-Id: Iae029be501d61189fced981dbc554e984fa7ed4b
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:11 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I1cd59a2966f692a4857343e21bf1586719939490
TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
Jack He [Thu, 29 Jun 2017 18:06:33 +0000 (18:06 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7 am:
9fd5d0da1e
am:
8d9e7be8e4
Change-Id: I211c5bfda4b9a2e2139e2c516716f83ad726e944
Jack He [Thu, 29 Jun 2017 17:58:13 +0000 (17:58 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7
am:
9fd5d0da1e
Change-Id: If22202112ad66a7b8d86438ca5d2947cf1842b8a
Jack He [Thu, 29 Jun 2017 17:53:10 +0000 (17:53 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
am:
874af710b7
Change-Id: Id65e6e11308c66893cb701af8909df9fee3a131f
Justin Klaassen [Thu, 29 Jun 2017 17:47:31 +0000 (17:47 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
am:
13d5f05350
Change-Id: Ic0bbf06e495f67ce50955e8db8d853852b5b8f0e
Albert Chaulk [Tue, 20 Jun 2017 18:39:29 +0000 (14:39 -0400)]
Add getCurrentImeTouchRegion to the WindowManager API
This is a followup to ag/
2370980/ to expose the API more
externally as a WindowManager API. This allows application
access without needing to reflect on IWindowManager.Stub.
We require this to get the current IME touch region to
display it properly in VR contexts.
Test: Manual
Bug:
62194867
Change-Id: Ibbf336e1e473b65d4c76a1492da187d50cfda424
Treehugger Robot [Thu, 29 Jun 2017 17:44:10 +0000 (17:44 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
Jack He [Wed, 21 Jun 2017 00:09:47 +0000 (17:09 -0700)]
Support battery level reporting via Apple VSC (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
Jack He [Thu, 29 Jun 2017 17:40:30 +0000 (17:40 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec am:
c286110c1a
am:
b01caeeb94
Change-Id: I0c35a8cd009940262e0055633b268a2da8fc11fc
TreeHugger Robot [Thu, 29 Jun 2017 17:38:13 +0000 (17:38 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
Jack He [Thu, 29 Jun 2017 17:32:35 +0000 (17:32 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec
am:
c286110c1a
Change-Id: I37cb48012b0f7170415693476d7e9f105798d814
Wyatt Riley [Thu, 29 Jun 2017 17:28:47 +0000 (17:28 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev
am:
e327572e36
Change-Id: Idc1ca1c01f8b77cd4ba7e1780335b9e0dea2b656
Jack He [Thu, 29 Jun 2017 17:25:26 +0000 (17:25 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
am:
c79c4240ec
Change-Id: I6aa50e541763adfa9ebe738d98d86152cf0cd1d5