OSDN Git Service
Jonathan Solnit [Fri, 30 Jun 2017 16:11:22 +0000 (16:11 +0000)]
Merge "Turn off camera lift logging" into oc-dr1-dev
TreeHugger Robot [Fri, 30 Jun 2017 15:15:40 +0000 (15:15 +0000)]
Merge "Fix test failure" into oc-dr1-dev
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
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
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 [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 [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)
TreeHugger Robot [Fri, 30 Jun 2017 03:22:45 +0000 (03:22 +0000)]
Merge "Add getCurrentImeTouchRegion to the WindowManager API" into oc-dr1-dev
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
TreeHugger Robot [Fri, 30 Jun 2017 01:50:48 +0000 (01:50 +0000)]
Merge "Remove IPC calls from synchronized block." into oc-dr1-dev
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
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
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 [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
TreeHugger Robot [Thu, 29 Jun 2017 23:19:58 +0000 (23:19 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
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
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
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
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
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
TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
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:38:13 +0000 (17:38 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 17:18:14 +0000 (17:18 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 16:49:46 +0000 (16:49 +0000)]
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev
Sundeep Ghuman [Mon, 19 Jun 2017 23:56:41 +0000 (16:56 -0700)]
Move TestAccessPointBuilder.
This is necessary to make it accessible to other test packages, such as
WifiSettingsUiTest.java in packages/apps/Settings.
Bug:
37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Ic1e4185639b2947433d6371e74448097d6adb962
TreeHugger Robot [Thu, 29 Jun 2017 16:45:50 +0000 (16:45 +0000)]
Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 16:33:00 +0000 (16:33 +0000)]
Merge "Remove extraneous log message" into oc-dr1-dev
Paul McLean [Wed, 7 Jun 2017 22:48:32 +0000 (16:48 -0600)]
Adding USB Headset awareness.
Bug:
36220140
Bug:
62043095
Test: Manual
Change-Id: Ic4636e3dc2dfce0154e6405848bea7752cf2d07b
Android Build Merger (Role) [Thu, 29 Jun 2017 16:20:48 +0000 (16:20 +0000)]
Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am:
ea6fea4d5d" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 16:20:13 +0000 (16:20 +0000)]
Merge "Update WifiConfiguration in AccessPoint." into oc-dr1-dev
Scott Main [Thu, 29 Jun 2017 16:19:20 +0000 (16:19 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
am:
ea6fea4d5d
Change-Id: I322405e6712ef9affb57d86e43b852e19cdc7f88
Scott Main [Thu, 29 Jun 2017 16:12:47 +0000 (16:12 +0000)]
Merge "add links to Log class summary for methods and logcat doc" into oc-dev
Justin Klaassen [Mon, 26 Jun 2017 14:55:08 +0000 (07:55 -0700)]
Add @*android:bool/config_defaultRingtonePickerEnabled
Bug:
62996582
Test: verify activity is enabled by default
Change-Id: I9503cd09066d1a61f670da2139758ef83b5edea3
Adrian Roos [Thu, 29 Jun 2017 15:26:27 +0000 (17:26 +0200)]
AOD: avoid flicker when turning off screen
Avoids a flicker during the turn off sequence where
the status bar would not enter the keyguard mode until
after AOD has already shown.
To avoid this, now also show keyguard if dozing and
the device is not yet fully asleep as long as the
screen is off.
Change-Id: Ic90b33a368332c9a7d7202b4e25a6c7c23b6506c
Fixes:
36506840
Test: Enable AOD, go to home screen, press power. Verify that there is no flicker in the transition to AOD.
Chet Haase [Thu, 29 Jun 2017 14:54:19 +0000 (07:54 -0700)]
Add docs for new padding/margin attributes.
The attributes for View, paddingHorizontal and paddingVertical,
were added in the O release and are documented in R.attr. But they
should also be referenced in View itself, alongside the other
padding parameters.
Similarly, the new layout_MarginHorizontal and
layout_marginVertical should be referenced in
ViewGroup.MarginLayoutParams.
Bug:
63128350 Add docs about new padding/margin params
Test: built docs, checked the result
Change-Id: I3021df5ea83c469811b4a6ec6ecd3ab2966ec384
Chris Wren [Thu, 29 Jun 2017 14:10:02 +0000 (10:10 -0400)]
add an auto-merge guard to the metrics constants file
Test: make
Bug:
63127271
Change-Id: Ib03a14d2a9e321d743a67f72f9be50259ced162a
TreeHugger Robot [Thu, 29 Jun 2017 13:38:24 +0000 (13:38 +0000)]
Merge "Be more lenient when processing group headers" into oc-dr1-dev
Jason Monk [Thu, 29 Jun 2017 13:34:26 +0000 (09:34 -0400)]
Remove extraneous log message
Test: make
Bug:
62620242
Change-Id: I5861f074e1db89cab44d6c86a32d2340b283f588
Selim Cinek [Thu, 29 Jun 2017 08:28:17 +0000 (10:28 +0200)]
Be more lenient when processing group headers
We are now only looking at the contracted header instead of all
sorts of headers and if the current header is null, we don't
look any further but consider it to be equal.
Bug:
62378776
Test: add notification groups with multiple headers, observe correct icon / text behavior
Change-Id: I0b83b91caaace30df3bdcba7225e93bd0e195484
TreeHugger Robot [Thu, 29 Jun 2017 05:51:39 +0000 (05:51 +0000)]
Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 05:38:33 +0000 (05:38 +0000)]
Merge "Change TRON counters to reflect cl/
159755374" into oc-dr1-dev
Sundeep Ghuman [Tue, 6 Jun 2017 02:47:36 +0000 (19:47 -0700)]
Update WifiConfiguration in AccessPoint.
Currently, calling AccessPoint.update(config, info, networkInfo) will
not store the new WifiConfiguration object if it has changed. This can
cause the summary statement to fall out of sync.
Bug: b/
38409294
Test: Open WifiNetworkDetails page with verbose logging. Stale state no
longer shown when config changes.
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I86411527472621f86ab691ee772c0b3d2153d01f
TreeHugger Robot [Thu, 29 Jun 2017 04:31:36 +0000 (04:31 +0000)]
Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 02:33:09 +0000 (02:33 +0000)]
Merge "hidl getService throw correct exceptions." into oc-dr1-dev
Winson Chung [Thu, 29 Jun 2017 02:32:55 +0000 (02:32 +0000)]
Merge "Updating dismiss button icon to be rounded." into oc-dr1-dev
Winson Chung [Thu, 29 Jun 2017 02:31:54 +0000 (02:31 +0000)]
Merge "Fixing black background when going back from assistant." into oc-dr1-dev
Tri Vo [Thu, 29 Jun 2017 02:26:14 +0000 (02:26 +0000)]
Merge "Fwk vibrator server handles vibrator hal dying." into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 02:16:43 +0000 (02:16 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: Iea0afa18746c4b04d12433902140d65d4af50c8e
Robert Carr [Thu, 29 Jun 2017 02:15:32 +0000 (02:15 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: I29e5507d716e19060d4c0578d4b4df3bcfa30069
Eugene Susla [Thu, 29 Jun 2017 02:14:22 +0000 (02:14 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I024af9dfe70fb340b2dc481f8aad6b12351b56cb
John Reck [Thu, 29 Jun 2017 02:13:18 +0000 (02:13 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: Ic3be7167429e8cd6a291ac0465e883522afcf9e3
Jorim Jaggi [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am:
a96d749140
Change-Id: I5f11ef2c520e418242b44db32d087656c4eb3984
TreeHugger Robot [Thu, 29 Jun 2017 02:00:51 +0000 (02:00 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 01:47:41 +0000 (01:47 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:43:52 +0000 (01:43 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
* changes:
Revert "Replaced overlay target package"
Revert "Support dark text on Recents"
TreeHugger Robot [Thu, 29 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 00:09:25 +0000 (00:09 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
TreeHugger Robot [Wed, 28 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 23:21:07 +0000 (16:21 -0700)]
Further restrict activity launch on virtual displays
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
Sundeep Ghuman [Thu, 22 Jun 2017 05:35:30 +0000 (22:35 -0700)]
Clear AccessPoints in WifiTracker when Wifi is Off.
When Wifi is not Enabled, we should clear existing access points. This
avoids showing stale data when wifi is turned back on. Since this method can
now invoke onAccessPointsChanged callbacks, add extra gating for
mStaleScanResults.
Improve test flakiness by waiting for Work and Main handlers to
finish processing messages before continuing.
Bug: b/
37832771
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I34faabec01a7188debe3c3b2fe6a0e02f49b320f
Scott Main [Wed, 28 Jun 2017 22:57:01 +0000 (15:57 -0700)]
add links to Log class summary for methods and logcat doc
bug:
29123084
Change-Id: Ida1351ca3647faa133905c5ff85df716bffd3203
Lucas Dupin [Wed, 28 Jun 2017 23:00:39 +0000 (16:00 -0700)]
Revert "Replaced overlay target package"
This reverts commit
ae885416dddd684fab2369fde234dc9e48db5051.
Lucas Dupin [Wed, 28 Jun 2017 23:00:26 +0000 (16:00 -0700)]
Revert "Support dark text on Recents"
This reverts commit
512ce6c9b75ce7d3f4f70280a414ab8fb994e809.
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
Wyatt Riley [Wed, 28 Jun 2017 02:59:19 +0000 (19:59 -0700)]
Ensure complete GnssStatus construction
Using volatile reference & final member pattern.
Bug:
37517406
Test: basic GNSS & GPS Status output works
Change-Id: I5650149e0a3f63a52734c8f044d38f3956819921
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of
91870d158748 to oc-dr1-dev
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
Jorim Jaggi [Wed, 28 Jun 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
Sujith Ramakrishnan [Fri, 9 Jun 2017 01:18:12 +0000 (18:18 -0700)]
Prevent unwanted keypress actions during TV Setup.
- Prevent Search or long-press Home actions
while TV setup is being completed based
on flag TV_USER_SETUP_COMPLETE.
Test: Manual - Reset device, ran Setup, tried keys.
Test: Manual - Rebooted device after Setup, tried keys.
Bug:
62419382
Change-Id: Ic8fb0f10943ab7c39a7d9857f62e6ab292231b40
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Sundeep Ghuman [Wed, 21 Jun 2017 23:54:36 +0000 (16:54 -0700)]
Change TRON counters to reflect cl/
159755374
This updates to the newly defined TRON counters and futures proofs us
for new values. Prior to this change, introducing a new enum would throw
an IllegalArgumentException.
Bug: b/
35628911
Test: NA
Change-Id: I46662d53b31858396c9a5a6113b1166fba4dfc51
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.
Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit
913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)
Mady Mellor [Wed, 7 Jun 2017 21:53:58 +0000 (14:53 -0700)]
Adjustments to PIP position while flinging
Rather than using a scroller, find the actual edge intercept
based on the trajectory of the fling.
This is done by finding the two points it could intersect with
and checking which point is 'closer' (i.e. would be hit first
by the PIP).
Bias towards using the intersection with the top / bottom edge
if the PIP is being flung along the side it's currently on.
Also increases the maximum time for the fling.
Bug:
35358634
Test: manual - fling PIP around screen while in landscape
and portrait
Change-Id: I26e943a5ddbc726ab86bc11e4271d4db034f3d47
Alison Cichowlas [Wed, 28 Jun 2017 20:08:21 +0000 (20:08 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Winson Chung [Wed, 28 Jun 2017 18:54:22 +0000 (11:54 -0700)]
Fixing black background when going back from assistant.
- When returning to a non-wallpaper task from the assistant, the
opaque animation background for the task-close animation was
drawing behind the assistant stack and occluding the fullscreen
task. The original change in ag/99642 no longer applies since
our task switcher has changed and we can remove this opaque
background.
Bug:
63072954
Test: Open fullscreen task, open assistant, hit back. Also ensure
that launching and closing new tasks don't result in additional
tasks being visible.
Change-Id: I3347a552b15d3cd5ed51f283b99e4caa5eb298a0
Alison Cichowlas [Wed, 28 Jun 2017 18:49:21 +0000 (14:49 -0400)]
Disable failing RoundedCornersTest
Bug:
63098063
Test: literally just test changes
Change-Id: Ibde220ccc049baa56f76c385543f97b241b4dc30
Jorim Jaggi [Wed, 28 Jun 2017 18:40:27 +0000 (14:40 -0400)]
Properly check for orientation mismatch
Previous check tested against the display, which is wrong. Now
we properly check against the configuration.
Test: go/wm-smoke
Test: Enter split screen, go home, launch app, go home, relaunch
app, ensure no splash screen shown
Test: Enter split screen with 2 apps, lock phone, unlock phone
Change-Id: I62d45b6d3e5aa91dcb5edffed4233a5fed7ac9aa
Fixes:
63075521