OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Ellipsize long QS labels." into pi-dev am: 1848f1e384
Amin Shaikh [Wed, 25 Apr 2018 17:15:03 +0000 (10:15 -0700)]
Merge "Ellipsize long QS labels." into pi-dev am: 1848f1e384
am: a351e34dab

Change-Id: Ia4973043997e2677aea68f04cc708adbdeb7d0a7

6 years agoMerge "Ellipsize long QS labels." into pi-dev
Amin Shaikh [Wed, 25 Apr 2018 17:08:35 +0000 (10:08 -0700)]
Merge "Ellipsize long QS labels." into pi-dev
am: 1848f1e384

Change-Id: I9a12918f98dde884a0ae3cdf1392f68a00ef0fd8

6 years agoMerge "Ellipsize long QS labels." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 16:56:37 +0000 (16:56 +0000)]
Merge "Ellipsize long QS labels." into pi-dev

6 years agoMerge "Add @TestApi to KeyEvent.actionToString(..)"
TreeHugger Robot [Wed, 25 Apr 2018 16:12:56 +0000 (16:12 +0000)]
Merge "Add @TestApi to KeyEvent.actionToString(..)"

6 years agoMerge "Keyguard: fix possible divergent state" into pi-dev am: 5d8dfe17c8
Adrian Roos [Wed, 25 Apr 2018 15:50:52 +0000 (08:50 -0700)]
Merge "Keyguard: fix possible divergent state" into pi-dev am: 5d8dfe17c8
am: a6d97163d6

Change-Id: Ib514eb5efd239d3659229339a34a7f651607bf50

6 years agoMerge "Keyguard: fix possible divergent state" into pi-dev
Adrian Roos [Wed, 25 Apr 2018 15:42:45 +0000 (08:42 -0700)]
Merge "Keyguard: fix possible divergent state" into pi-dev
am: 5d8dfe17c8

Change-Id: I5a34a26dec8c63abb3e210ab9209b8de43b0f32c

6 years agoMerge "Move brightness color conversion from SysUI to settingslib" into pi-dev am...
Fan Zhang [Wed, 25 Apr 2018 15:29:44 +0000 (08:29 -0700)]
Merge "Move brightness color conversion from SysUI to settingslib" into pi-dev am: 04d504be03
am: 72e8d917d2

Change-Id: Id4e0154db72db89746f5a14ea8527ae6cb8f80dc

6 years agoMerge "Keyguard: fix possible divergent state" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 15:29:07 +0000 (15:29 +0000)]
Merge "Keyguard: fix possible divergent state" into pi-dev

6 years agoMerge "Move brightness color conversion from SysUI to settingslib" into pi-dev
Fan Zhang [Wed, 25 Apr 2018 15:19:17 +0000 (08:19 -0700)]
Merge "Move brightness color conversion from SysUI to settingslib" into pi-dev
am: 04d504be03

Change-Id: I200dc03637fb358b6862db27babb781b851bbc97

6 years agoMerge "Synchronize RootWindowContainerTests" into pi-dev am: 628e9b3d37
Chavi Weingarten [Wed, 25 Apr 2018 15:07:39 +0000 (08:07 -0700)]
Merge "Synchronize RootWindowContainerTests" into pi-dev am: 628e9b3d37
am: 7e82751bdd

Change-Id: Ifc1bc1234ebcc89f9dc1728b77d95ce4a6fb4ae9

6 years agoMerge "Move brightness color conversion from SysUI to settingslib" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 15:07:31 +0000 (15:07 +0000)]
Merge "Move brightness color conversion from SysUI to settingslib" into pi-dev

6 years agoMerge "Synchronize RootWindowContainerTests" into pi-dev
Chavi Weingarten [Wed, 25 Apr 2018 14:55:06 +0000 (07:55 -0700)]
Merge "Synchronize RootWindowContainerTests" into pi-dev
am: 628e9b3d37

Change-Id: Ic7c2f187a063fa4289b25d06ea7e917f8aa33c5c

6 years agoMerge "Potentially fix notification launch animation" into pi-dev am: 8f699919ce
Jorim Jaggi [Wed, 25 Apr 2018 14:44:44 +0000 (07:44 -0700)]
Merge "Potentially fix notification launch animation" into pi-dev am: 8f699919ce
am: 99297b61c6

Change-Id: Ia10db83997300d07998936d128dd703156378e0c

6 years agoMerge "Synchronize RootWindowContainerTests" into pi-dev
Chavi Weingarten [Wed, 25 Apr 2018 14:44:17 +0000 (14:44 +0000)]
Merge "Synchronize RootWindowContainerTests" into pi-dev

6 years agoMerge "Add new hidden APIs" into pi-dev am: eb0e982228
David Brazdil [Wed, 25 Apr 2018 14:39:37 +0000 (07:39 -0700)]
Merge "Add new hidden APIs" into pi-dev am: eb0e982228
am: b823d8f902

Change-Id: I702e34893d55e318e442717c5d60fbcf45773733

6 years agoMerge "Potentially fix notification launch animation" into pi-dev
Jorim Jaggi [Wed, 25 Apr 2018 14:34:14 +0000 (07:34 -0700)]
Merge "Potentially fix notification launch animation" into pi-dev
am: 8f699919ce

Change-Id: I0ff778f32604091d496bdbb92cc5d19100bd5073

6 years agoMerge "Add new hidden APIs" into pi-dev
David Brazdil [Wed, 25 Apr 2018 14:29:04 +0000 (07:29 -0700)]
Merge "Add new hidden APIs" into pi-dev
am: eb0e982228

Change-Id: I0ad7cad60cb758b9ddd827612e55c43c785ebd42

6 years agoMerge "Potentially fix notification launch animation" into pi-dev
Jorim Jaggi [Wed, 25 Apr 2018 14:17:45 +0000 (14:17 +0000)]
Merge "Potentially fix notification launch animation" into pi-dev

6 years agoMerge "Add more light greylist entries." into pi-dev am: 72b1a7ecb9
Mathew Inwood [Wed, 25 Apr 2018 14:04:41 +0000 (07:04 -0700)]
Merge "Add more light greylist entries." into pi-dev am: 72b1a7ecb9
am: 9605012d56

Change-Id: I21dc6392b5d1c4036d75f781827c5b6c32b1a13e

6 years agoMerge "Add new hidden APIs" into pi-dev
David Brazdil [Wed, 25 Apr 2018 13:59:20 +0000 (13:59 +0000)]
Merge "Add new hidden APIs" into pi-dev

6 years agoMerge "Add more light greylist entries." into pi-dev
Mathew Inwood [Wed, 25 Apr 2018 13:56:06 +0000 (06:56 -0700)]
Merge "Add more light greylist entries." into pi-dev
am: 72b1a7ecb9

Change-Id: I97e4125143f7d1c9588a993a1f9c9fd52aeabc2b

6 years agoMerge "Added OWNERS file to am package." into pi-dev am: c907be6fd5
Wale Ogunwale [Wed, 25 Apr 2018 13:43:46 +0000 (06:43 -0700)]
Merge "Added OWNERS file to am package." into pi-dev am: c907be6fd5
am: 8176fa9b23

Change-Id: Ia50628669cf970c2a6c83412c408f01f9e61c935

6 years agoMerge "Add more light greylist entries." into pi-dev
Mathew Inwood [Wed, 25 Apr 2018 13:41:44 +0000 (13:41 +0000)]
Merge "Add more light greylist entries." into pi-dev

6 years agoMerge "Added OWNERS file to am package." into pi-dev
Wale Ogunwale [Wed, 25 Apr 2018 13:30:49 +0000 (06:30 -0700)]
Merge "Added OWNERS file to am package." into pi-dev
am: c907be6fd5

Change-Id: I52f65ea0ca8213cc56b3795ff6eac88ec485a955

6 years agoMerge "Added OWNERS file to am package." into pi-dev
Wale Ogunwale [Wed, 25 Apr 2018 13:15:07 +0000 (13:15 +0000)]
Merge "Added OWNERS file to am package." into pi-dev

6 years agoAdd new hidden APIs
David Brazdil [Wed, 25 Apr 2018 10:49:16 +0000 (11:49 +0100)]
Add new hidden APIs

Bug: 78552452
Test: make
Change-Id: I73dc97a33b645f6cd9b7bf4a37254737ed3107ce

6 years agoMerge "Default vibration amplitude resolution added"
TreeHugger Robot [Wed, 25 Apr 2018 12:39:01 +0000 (12:39 +0000)]
Merge "Default vibration amplitude resolution added"

6 years agoKeyguard: fix possible divergent state
Adrian Roos [Wed, 25 Apr 2018 12:01:11 +0000 (14:01 +0200)]
Keyguard: fix possible divergent state

Fixes an issue where the state in SystemUI and AM/WM could
get out of sync: If the keyguardGoingAway transition is
started and then later canceled by SystemUI, it never
tells AM that it canceled it.
This causes SystemUI to show itself in keyguard mode,
meanwhile AM/WM do not hide the underlying app because
the status bar is in the going away transition as far
as it is concerned.

Change-Id: I5966f0655fd694ae599a83dda7a9f6463088632b
Fixes: 76367931
Test: delay keyguard going away callback, unlock phone, during the delay, remove SIM; verify it does not end up in bad state

6 years agoMerge "New light grey APIs." into pi-dev am: 36c643ed4f
Nicolas Geoffray [Wed, 25 Apr 2018 10:18:17 +0000 (03:18 -0700)]
Merge "New light grey APIs." into pi-dev am: 36c643ed4f
am: f1f1c56baf

Change-Id: I4529f75fbf0417779a72e056fdcd95a350ee4525

6 years agoMerge "More light grey APIs." into pi-dev am: 3d33656347
Nicolas Geoffray [Wed, 25 Apr 2018 10:11:27 +0000 (03:11 -0700)]
Merge "More light grey APIs." into pi-dev am: 3d33656347
am: 5e67063bb2

Change-Id: Ib44bd51eabacfbe9f1bc53f6491ee78623c04670

6 years agoMerge "New light grey APIs." into pi-dev
Nicolas Geoffray [Wed, 25 Apr 2018 10:07:52 +0000 (03:07 -0700)]
Merge "New light grey APIs." into pi-dev
am: 36c643ed4f

Change-Id: I1d3d7e2c506d60b2d8229bcf52cd3a5d20c697bc

6 years agoMerge "Add more light grey APIs." into pi-dev am: be8638307f
Nicolas Geoffray [Wed, 25 Apr 2018 10:03:26 +0000 (03:03 -0700)]
Merge "Add more light grey APIs." into pi-dev am: be8638307f
am: 03cafff5fd

Change-Id: I7ec8df006834cd50df63a7b35b1c7ac90afcd790

6 years agoMerge "More light grey APIs." into pi-dev
Nicolas Geoffray [Wed, 25 Apr 2018 10:03:21 +0000 (03:03 -0700)]
Merge "More light grey APIs." into pi-dev
am: 3d33656347

Change-Id: I108782a08b97f90fee5a7f6cb6808256fda70dfb

6 years agoMerge "Add more light grey APIs." into pi-dev
Nicolas Geoffray [Wed, 25 Apr 2018 09:56:31 +0000 (02:56 -0700)]
Merge "Add more light grey APIs." into pi-dev
am: be8638307f

Change-Id: I999a544aca5805d3655419f5da6728058184d7a1

6 years agoMerge "New light grey APIs." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 09:54:06 +0000 (09:54 +0000)]
Merge "New light grey APIs." into pi-dev

6 years agoMerge "More light grey APIs." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 09:51:04 +0000 (09:51 +0000)]
Merge "More light grey APIs." into pi-dev

6 years agoMerge "Remove unnecessary WTFs from password state check" into pi-dev am: 24ba8398fe
Eran Messeri [Wed, 25 Apr 2018 09:50:16 +0000 (02:50 -0700)]
Merge "Remove unnecessary WTFs from password state check" into pi-dev am: 24ba8398fe
am: 4ac95fbe91

Change-Id: I232671cc125875cdbe47067d2d2022966718d180

6 years agoMerge "Add more light grey APIs." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 09:41:41 +0000 (09:41 +0000)]
Merge "Add more light grey APIs." into pi-dev

6 years agoMerge "Remove unnecessary WTFs from password state check" into pi-dev
Eran Messeri [Wed, 25 Apr 2018 09:39:53 +0000 (02:39 -0700)]
Merge "Remove unnecessary WTFs from password state check" into pi-dev
am: 24ba8398fe

Change-Id: I8a8c66ba6bb0c83c1f57cfd48761863d3a8a4f72

6 years agoMerge "Remove unnecessary WTFs from password state check" into pi-dev
Eran Messeri [Wed, 25 Apr 2018 09:28:15 +0000 (09:28 +0000)]
Merge "Remove unnecessary WTFs from password state check" into pi-dev

6 years agoAdd more light grey APIs.
Nicolas Geoffray [Tue, 24 Apr 2018 12:26:45 +0000 (13:26 +0100)]
Add more light grey APIs.

bug: 64382372
Test: m
Change-Id: Ib15b65c376e4038232d4c1e04d10e508b34786af

6 years agoMore light grey APIs.
Nicolas Geoffray [Tue, 24 Apr 2018 12:44:11 +0000 (13:44 +0100)]
More light grey APIs.

bug: 78436346
Test: m
Change-Id: I8bff5332abc93d49170c77fabb589bbcfa9249b6

6 years agoNew light grey APIs.
Nicolas Geoffray [Tue, 24 Apr 2018 13:02:02 +0000 (14:02 +0100)]
New light grey APIs.

bug: 78471731
Test: m
Change-Id: I52f34f735873de485a73169f1ebbffe9484d0fb7

6 years agoMerge "Deprecate private AsciiCapable protocol"
TreeHugger Robot [Wed, 25 Apr 2018 05:56:09 +0000 (05:56 +0000)]
Merge "Deprecate private AsciiCapable protocol"

6 years agoMerge "Refactor GnssGeofenceProvider" into pi-dev am: 728cb519a5
Yu-Han Yang [Wed, 25 Apr 2018 04:31:19 +0000 (21:31 -0700)]
Merge "Refactor GnssGeofenceProvider" into pi-dev am: 728cb519a5
am: 87bbfe0529

Change-Id: I18a1dc4af712e41c958a63bbcefccb59579d76b0

6 years agoMerge "Refactor GnssGeofenceProvider" into pi-dev
Yu-Han Yang [Wed, 25 Apr 2018 04:07:52 +0000 (21:07 -0700)]
Merge "Refactor GnssGeofenceProvider" into pi-dev
am: 728cb519a5

Change-Id: I165ae0783ce26c28ddb19ec68666a810855535b0

6 years agoMerge "Extract interface for the TemperatureView" into pi-dev am: db7bb0bcef
Joshua Brown [Wed, 25 Apr 2018 03:58:20 +0000 (20:58 -0700)]
Merge "Extract interface for the TemperatureView" into pi-dev am: db7bb0bcef
am: ac4f6a9bc0

Change-Id: I5a545798e1daabb736747061d7a7b5ed62393567

6 years agoMerge "Refactor GnssGeofenceProvider" into pi-dev
Yu-Han Yang [Wed, 25 Apr 2018 03:55:08 +0000 (03:55 +0000)]
Merge "Refactor GnssGeofenceProvider" into pi-dev

6 years agoMerge "Extract interface for the TemperatureView" into pi-dev
Joshua Brown [Wed, 25 Apr 2018 03:49:39 +0000 (20:49 -0700)]
Merge "Extract interface for the TemperatureView" into pi-dev
am: db7bb0bcef

Change-Id: I163424166b8a3a4c987fd6cf7a16c721afb64701

6 years agoMerge "Extract interface for the TemperatureView" into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 03:37:46 +0000 (03:37 +0000)]
Merge "Extract interface for the TemperatureView" into pi-dev

6 years agoDeprecate private AsciiCapable protocol
Yohei Yukawa [Wed, 25 Apr 2018 01:36:23 +0000 (18:36 -0700)]
Deprecate private AsciiCapable protocol

The concept "AsciiCapable InputMethodSubtype" was initially introduced
as a private protocol based on a magic keyword "AsciiCapable"
specified in "imeSubtypeExtraValue" attribute in API level 15 [1],
then became a public API "isAsciiCapable" attribute in API 19 [2].

However, it turns out that there remains one place in InputMethodUtils
where the previous private protocol is still used.

With this CL, InputMethodUtils stop relying on the previous private
AsciiCapable.

 [1]: I1a83b227498073c47567f73566043c273809adc9
      c36905673a7bcafe9ec74e82e6c4977f2aca6a50
 [2]: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
      dc8abf6cee0bcf44e2cad8155f0c151105d46471

Fix: 78537996
Test: make doc-comment-check-docs -j
Test: atest InputMethodPreferenceTest InputMethodUtilsTest
Change-Id: I56c0c19878657a41882c2d784e1ac96a52ab33f6

6 years agoAdd @TestApi to KeyEvent.actionToString(..)
Siarhei Vishniakou [Wed, 25 Apr 2018 00:57:44 +0000 (17:57 -0700)]
Add @TestApi to KeyEvent.actionToString(..)

Currently, it is not possible to use KeyEvent.actionToString(..) in a
CTS test because that API is @hide. However, it would be useful to print
these actions when tests fail. Therefore, add the @TestApi annotation.

Bug: 77803694 36069459
Test: m cts-input-lib CtsHardwareTestCases (under development)
Change-Id: I2d23dbd101cef3f1c6c7a70c521a9dc219797615

6 years agoMerge "Fixed the document of getNetworkCountryIso" am: 8252157aca am: 7f97be01f5
Jack Yu [Wed, 25 Apr 2018 00:54:51 +0000 (17:54 -0700)]
Merge "Fixed the document of getNetworkCountryIso" am: 8252157aca am: 7f97be01f5
am: 630be57f44

Change-Id: I5060c3bac5e28e02d08e7abce6e0552ee4a02b2e

6 years agoMerge "Fixed the document of getNetworkCountryIso" am: 8252157aca
Jack Yu [Wed, 25 Apr 2018 00:43:18 +0000 (17:43 -0700)]
Merge "Fixed the document of getNetworkCountryIso" am: 8252157aca
am: 7f97be01f5

Change-Id: I5c8cf44658007f6366d497c09f1cfba10a49da48

6 years agoMerge "Fixed the document of getNetworkCountryIso"
Jack Yu [Wed, 25 Apr 2018 00:31:23 +0000 (17:31 -0700)]
Merge "Fixed the document of getNetworkCountryIso"
am: 8252157aca

Change-Id: I6d4c5183d525a36bf1f1cee7fd034772427a3d32

6 years agoAdded OWNERS file to am package.
Wale Ogunwale [Tue, 24 Apr 2018 19:51:03 +0000 (12:51 -0700)]
Added OWNERS file to am package.

Why? Because I don't want to worry about things like ag/3760423

Test: N/A
Bug: 0
Change-Id: I96c38d8dfbb8ac5d530251de90acc8499f851075

6 years agoMerge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev...
Shuo Qian [Wed, 25 Apr 2018 00:22:15 +0000 (17:22 -0700)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev am: c4c7c19b67
am: 2413d7e6f8

Change-Id: I73c49b5497c7144e292deee2dbb766edf5eed46d

6 years agoMerge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
Shuo Qian [Wed, 25 Apr 2018 00:12:10 +0000 (17:12 -0700)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
am: c4c7c19b67

Change-Id: I453a20d444aeaff500b6272fb352494420699557

6 years agoMerge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
Shuo Qian [Tue, 24 Apr 2018 23:54:10 +0000 (23:54 +0000)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev

6 years agoRevert "Revert "Remove the OEM hook implementation and usage""
Robert Greenwalt [Tue, 24 Apr 2018 00:33:24 +0000 (00:33 +0000)]
Revert "Revert "Remove the OEM hook implementation and usage""

This reverts commit 7cfc5cda2f2a382a3eabd1c5382c412f2d1dedcf.

Reason for revert: Causes a critical error on Cuttlefish.

Bug: 78299964

Change-Id: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4

6 years agoMerge "Allow for the lock screen to have a different set of nav buttons" into pi...
Brad Stenning [Tue, 24 Apr 2018 23:31:04 +0000 (16:31 -0700)]
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev am: bdf8770ae3
am: 91d15b83c3

Change-Id: Ib3cf2b1160111805c45f2211536a2f4edc5f5560

6 years agoMerge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
Brad Stenning [Tue, 24 Apr 2018 23:16:12 +0000 (16:16 -0700)]
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
am: bdf8770ae3

Change-Id: If479ab643ce821eb698d4d25429f0132cd887bb2

6 years agoMerge "Fixed the document of getNetworkCountryIso"
Treehugger Robot [Tue, 24 Apr 2018 23:02:38 +0000 (23:02 +0000)]
Merge "Fixed the document of getNetworkCountryIso"

6 years agoMerge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 23:01:43 +0000 (23:01 +0000)]
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev

6 years agoMerge "Fix destruction of preserved surfaces for non app windows." into pi-dev am...
Rob Carr [Tue, 24 Apr 2018 22:54:09 +0000 (15:54 -0700)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev am: 6b683ecf6e
am: 59595cdc53

Change-Id: I28e385ac6f1eea11d749aa52dfce1327717a1964

6 years agoMerge "Fix destruction of preserved surfaces for non app windows." into pi-dev
Rob Carr [Tue, 24 Apr 2018 22:42:46 +0000 (15:42 -0700)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev
am: 6b683ecf6e

Change-Id: I3498de97f677e62050388e38462632475714e4a4

6 years agoSynchronize RootWindowContainerTests
chaviw [Tue, 24 Apr 2018 22:23:53 +0000 (15:23 -0700)]
Synchronize RootWindowContainerTests

There were a few failures that seem to be threading issues.
Specifically, IndexOutOfBounds within a for loop that was iterating the
size of the ArrayList and ArrayMap index failure. RootWindowContainerTests
calls into methods in WM that assume the WM lock is already held. Ensure
testSetDisplayOverrideConfigurationIfNeeded is synchronized.

Test: RootWindowContainerTests#testSetDisplayOverrideConfigurationIfNeeded
Change-Id: I5003fc4a59baae4990a1464dbbc85b0938312994
Fixes: 78349285

6 years agoMerge "Fix destruction of preserved surfaces for non app windows." into pi-dev
Rob Carr [Tue, 24 Apr 2018 22:32:14 +0000 (22:32 +0000)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev

6 years agoMerge "Don't call into AM finish-recents-animation while holding onto the WM lock...
Winson Chung [Tue, 24 Apr 2018 21:56:45 +0000 (14:56 -0700)]
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev am: 4187c1d9d0
am: bc512694b1

Change-Id: Ia5244ecc790d36c39460f66d894b608a7648c37a

6 years agoMerge "Actually @hide unwanted capability methods." into pi-dev am: a09c06a6c1
Lorenzo Colitti [Tue, 24 Apr 2018 21:50:14 +0000 (14:50 -0700)]
Merge "Actually @hide unwanted capability methods." into pi-dev am: a09c06a6c1
am: dc86aaa112

Change-Id: I923e5377a1abe761217612452cbfdba752e53de2

6 years agoMerge "Don't call into AM finish-recents-animation while holding onto the WM lock...
Winson Chung [Tue, 24 Apr 2018 21:47:40 +0000 (14:47 -0700)]
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev
am: 4187c1d9d0

Change-Id: I2b9a9cc997b80fb40388ca7d999ee1f2380d5fc6

6 years agoMerge "Actually @hide unwanted capability methods." into pi-dev
Lorenzo Colitti [Tue, 24 Apr 2018 21:43:06 +0000 (14:43 -0700)]
Merge "Actually @hide unwanted capability methods." into pi-dev
am: a09c06a6c1

Change-Id: I80a88123b16c54734306da7e5dc0670972041648

6 years agoMerge "Added OWNERS file for wm package." into pi-dev am: fe36369c07
Wale Ogunwale [Tue, 24 Apr 2018 21:42:58 +0000 (14:42 -0700)]
Merge "Added OWNERS file for wm package." into pi-dev am: fe36369c07
am: e62499effd

Change-Id: I47eba931937b8ea3578e8cbdd505b61bf111c2f8

6 years agoMerge "Added OWNERS file for wm package." into pi-dev
Wale Ogunwale [Tue, 24 Apr 2018 21:33:32 +0000 (14:33 -0700)]
Merge "Added OWNERS file for wm package." into pi-dev
am: fe36369c07

Change-Id: I454f8f8c2f0c35bcd966aac98b2fcb4427a6cd23

6 years agoMerge "Don't call into AM finish-recents-animation while holding onto the WM lock...
Winson Chung [Tue, 24 Apr 2018 21:21:26 +0000 (21:21 +0000)]
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev

6 years agoMerge "Actually @hide unwanted capability methods." into pi-dev
Lorenzo Colitti [Tue, 24 Apr 2018 21:20:25 +0000 (21:20 +0000)]
Merge "Actually @hide unwanted capability methods." into pi-dev

6 years agoMerge "Added OWNERS file for wm package." into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 21:03:57 +0000 (21:03 +0000)]
Merge "Added OWNERS file for wm package." into pi-dev

6 years agoMerge "Updated ColorDrawable to implement getColorFilter"
TreeHugger Robot [Tue, 24 Apr 2018 20:53:29 +0000 (20:53 +0000)]
Merge "Updated ColorDrawable to implement getColorFilter"

6 years agoMerge "Attach color space after performing a readback" into pi-dev am: 5bb709c31e
Leon Scroggins [Tue, 24 Apr 2018 20:47:24 +0000 (13:47 -0700)]
Merge "Attach color space after performing a readback" into pi-dev am: 5bb709c31e
am: 8bed8e4640

Change-Id: I30163b35febc6d62d65071be32e68e77d5b6b051

6 years agoMerge "Fix rounding of padding in NinePatchDrawable" into pi-dev am: eabeec49c4
Leon Scroggins III [Tue, 24 Apr 2018 20:42:36 +0000 (13:42 -0700)]
Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev am: eabeec49c4
am: ac2454c905

Change-Id: Ia2693ba87ed07a79315282ed5ab7f6c89cb11c6e

6 years agoMerge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev am...
Hansong Zhang [Tue, 24 Apr 2018 20:32:27 +0000 (13:32 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev am: dc34eb6055
am: a5c9aa3ecc

Change-Id: Ia7181241b8853f085d7e626337724473a28dddbc

6 years agoMerge "Attach color space after performing a readback" into pi-dev
Leon Scroggins [Tue, 24 Apr 2018 20:27:10 +0000 (13:27 -0700)]
Merge "Attach color space after performing a readback" into pi-dev
am: 5bb709c31e

Change-Id: Ia99aa64858049fbc31ba9fc9480f6feba96b20da

6 years agoMerge "RRO: Update target overlays after install" into pi-dev am: 5854a02719
Ryan Mitchell [Tue, 24 Apr 2018 20:26:34 +0000 (13:26 -0700)]
Merge "RRO: Update target overlays after install" into pi-dev am: 5854a02719
am: 54be19da18

Change-Id: Ibc55da7be7e564ceda253e778f792edf15bad1b2

6 years agoMerge "Fix rounding of padding in NinePatchDrawable" into pi-dev
Leon Scroggins III [Tue, 24 Apr 2018 20:22:12 +0000 (13:22 -0700)]
Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev
am: eabeec49c4

Change-Id: I4c0f080bec08f3437c7c2c393a8213609f8ac623

6 years agoMerge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev
Hansong Zhang [Tue, 24 Apr 2018 20:16:57 +0000 (13:16 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev
am: dc34eb6055

Change-Id: Ia4f090d2f8b273f0cf7527791d043f9d3d1c373c

6 years agoAudioPlaybackConfiguration release/death: notify listeners am: 2a28126af9
Jean-Michel Trivi [Tue, 24 Apr 2018 20:16:46 +0000 (13:16 -0700)]
AudioPlaybackConfiguration release/death: notify listeners am: 2a28126af9
am: 9c3d892059

Change-Id: I38b630f8622b3efc1c9b4e1cc5a7bd6ac71f9a30

6 years agoMerge "RRO: Update target overlays after install" into pi-dev
Ryan Mitchell [Tue, 24 Apr 2018 20:11:22 +0000 (13:11 -0700)]
Merge "RRO: Update target overlays after install" into pi-dev
am: 5854a02719

Change-Id: I64ae21a1462007bf2e2d5d41fcecf9ffbc78819b

6 years agoMerge "Don't automatically decline tracking jobs with met initial delays" into pi...
Chris Tate [Tue, 24 Apr 2018 20:03:30 +0000 (13:03 -0700)]
Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev am: ed9f3ef958
am: 13b550026b

Change-Id: Ic2a5a1df4c9b12c02a46fc3384bfa2dc863d60ac

6 years agoMerge "Attach color space after performing a readback" into pi-dev
Leon Scroggins [Tue, 24 Apr 2018 20:01:22 +0000 (20:01 +0000)]
Merge "Attach color space after performing a readback" into pi-dev

6 years agoAudioPlaybackConfiguration release/death: notify listeners
Jean-Michel Trivi [Tue, 24 Apr 2018 19:59:09 +0000 (12:59 -0700)]
AudioPlaybackConfiguration release/death: notify listeners
am: 2a28126af9

Change-Id: Id746122af3bc178f20d448e14afd81d8040fc507

6 years agoMerge "Fix rounding of padding in NinePatchDrawable" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev

6 years agoMerge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 19:53:49 +0000 (19:53 +0000)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev

6 years agoMerge "RRO: Update target overlays after install" into pi-dev
Ryan Mitchell [Tue, 24 Apr 2018 19:53:33 +0000 (19:53 +0000)]
Merge "RRO: Update target overlays after install" into pi-dev

6 years agoMerge "Don't automatically decline tracking jobs with met initial delays" into pi-dev
Chris Tate [Tue, 24 Apr 2018 19:51:29 +0000 (12:51 -0700)]
Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev
am: ed9f3ef958

Change-Id: I0ce9f93fc87a33114cf64c4aa9dff4e1ae325477

6 years agoAdded OWNERS file for wm package.
Wale Ogunwale [Tue, 24 Apr 2018 19:39:26 +0000 (12:39 -0700)]
Added OWNERS file for wm package.

Why? Because I don't want to worry about things like ag/3760423

Test: N/A
Bug: 0
Change-Id: I230b7e8aead53395da5c58aa27ed547cf06fb327

6 years agoUpdated ColorDrawable to implement getColorFilter
Nader Jawad [Tue, 24 Apr 2018 00:13:06 +0000 (17:13 -0700)]
Updated ColorDrawable to implement getColorFilter

ColorDrawable previously did not implement getColorFilter despite having
a proper setColorFilter implementation. Updated ColorDrawable to support
getColorFilter returning the corresponding ColorFilter configured on
it's paint.

Change-Id: Iabc3cd1b9110f5c3ec25e26a31966e2a43f8fb16
Fixes:78476471
Test: Re-ran CtsGraphicsTest

6 years agoAudioPlaybackConfiguration release/death: notify listeners
Jean-Michel Trivi [Tue, 24 Apr 2018 00:22:55 +0000 (17:22 -0700)]
AudioPlaybackConfiguration release/death: notify listeners

When a player dies or is released, dispatch an update to the
  AudioPlaybackConfiguration listeners.

Bug: 70195346
Test: atest AudioPlaybackConfiguration#testCallbackMediaPlayerRelease
Change-Id: Id0b62abb32879d3166da26f20a334d0447183ac0

6 years agoMerge "Don't automatically decline tracking jobs with met initial delays" into pi-dev
Chris Tate [Tue, 24 Apr 2018 19:25:23 +0000 (19:25 +0000)]
Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev

6 years agoAllow for the lock screen to have a different set of nav buttons
Brad Stenning [Sat, 14 Apr 2018 05:52:39 +0000 (22:52 -0700)]
Allow for the lock screen to have a different set of nav buttons

Bug:74446022

Test: Manually. Test by switching users that have PINs set

Change-Id: Id956b0cfe76eba82235b82080c755489bdf67938

6 years agoMove brightness color conversion from SysUI to settingslib
Fan Zhang [Tue, 24 Apr 2018 18:14:06 +0000 (11:14 -0700)]
Move brightness color conversion from SysUI to settingslib

The color space conversion logic in BrightnessController is also needed
by Settings app to display brightness percentage correctly. This change
moves the conversion logic to settingslib so it can be shared by other
UIs such as Settings/VrSettings.

Bug: 73810208
Test: atest RunSettingsLibRoboTests
Change-Id: If92f0da2d930fec797902b5d1b3731100e1d0ea4