OSDN Git Service
David Brazdil [Tue, 22 May 2018 09:59:36 +0000 (02:59 -0700)]
Merge "Add more hidden API usages into greylist" into pi-dev am:
9b2938d253
am:
e3614bdd76
Change-Id: I9ef28ca450c82ce94e42e2ccb34754f17812123f
David Brazdil [Tue, 22 May 2018 09:50:58 +0000 (02:50 -0700)]
Merge "Add more hidden API usages into greylist" into pi-dev
am:
9b2938d253
Change-Id: Ie09f6aea0754247d9f94f4c356bae1e254a08cd7
David Brazdil [Tue, 22 May 2018 09:41:15 +0000 (09:41 +0000)]
Merge "Add more hidden API usages into greylist" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 09:20:17 +0000 (09:20 +0000)]
Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library"
Remi NGUYEN VAN [Tue, 22 May 2018 08:14:13 +0000 (01:14 -0700)]
Merge "Move CaptivePortalProbeResult to its own file" into pi-dev am:
fd12af848a
am:
adfb78afdc
Change-Id: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9
Chalard Jean [Tue, 22 May 2018 08:09:11 +0000 (01:09 -0700)]
Merge "Fix setCapabilities." into pi-dev am:
d1d4cc94ba
am:
c60a252b87
Change-Id: Ia5bebf8a233775367bbf1b788870528934ecbcfb
Remi NGUYEN VAN [Tue, 22 May 2018 08:09:08 +0000 (01:09 -0700)]
Merge "Move CaptivePortalProbeResult to its own file" into pi-dev
am:
fd12af848a
Change-Id: Ia48b32307a51a66f2672d7112f71166dd6db41b1
Chalard Jean [Tue, 22 May 2018 08:01:39 +0000 (01:01 -0700)]
Merge "Fix setCapabilities." into pi-dev
am:
d1d4cc94ba
Change-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1
Remi NGUYEN VAN [Tue, 22 May 2018 08:00:56 +0000 (08:00 +0000)]
Merge "Move CaptivePortalProbeResult to its own file" into pi-dev
Chalard Jean [Tue, 22 May 2018 07:51:09 +0000 (07:51 +0000)]
Merge "Fix setCapabilities." into pi-dev
Dianne Hackborn [Tue, 22 May 2018 07:46:07 +0000 (00:46 -0700)]
[automerger skipped] Merge "Add new hidden-for-now AppOpsManager APIs to greylist." into pi-dev am:
7b8ac80db5
am:
7425f704ea -s ours
Change-Id: I26fb5d97a08ef448366e3985554db35fcb5149d2
Dianne Hackborn [Tue, 22 May 2018 07:35:07 +0000 (00:35 -0700)]
Merge "Add new hidden-for-now AppOpsManager APIs to greylist." into pi-dev
am:
7b8ac80db5
Change-Id: I6ae9e668f5c3df80e1017b45c7e02299ed35cfb1
TreeHugger Robot [Tue, 22 May 2018 07:18:27 +0000 (07:18 +0000)]
Merge "Add new hidden-for-now AppOpsManager APIs to greylist." into pi-dev
TreeHugger Robot [Tue, 22 May 2018 07:14:03 +0000 (07:14 +0000)]
Merge "Add new hidden-for-now AppOpsManager APIs to greylist."
felkachang [Tue, 22 May 2018 06:19:32 +0000 (23:19 -0700)]
Clock notification text was cut off am:
e8a3536660
am:
bc72e3a15e
Change-Id: I2ebcf9434ec34158ab2febd326e00b3c404b678a
felkachang [Tue, 22 May 2018 06:14:41 +0000 (23:14 -0700)]
Clock notification text was cut off
am:
e8a3536660
Change-Id: Ieab07607cf1379704dadecad8fbd60eafe7fc005
felkachang [Fri, 18 May 2018 12:11:38 +0000 (20:11 +0800)]
Clock notification text was cut off
The root cause is that HeadsUpStatusBarView doesn't considerate the
Cut Out situation. The Cut Out situation can use
getRootWindowInsets().getDisplayCutout().getSafeInsetLeft() to get
the the value.
There are two parts need to handle Cut out.
The one part is to handle the padding. It needs to considerate both of
mLeftInset and mLeftCutOutInset because it use getLocationOnScreen to
count the location.
The other part is to handle the HeadsUpStatusBarView.translationX.
It only needs to considerate mLeftCutOutInset because landscape
degree 90 has the left side cut out and translationX by the distance
between screen left boundary and scroller's left boundary. The
distance include Cut Out so it need minus mCutOutInsetLeft in the
setPanelTranslation.
Cut Out has 4 mode: Disable, Corner, Double, and Tall. Disable and
Double are handled by the same way. Corner and Tall are handled
by the same way.
Bug:
78113562
Test: atest SystemUITests
Change-Id: Ic2a272c43f65eed8c4b3749787637f5fb848bb8a
Fix:
78113562
Lucas Dupin [Tue, 22 May 2018 06:01:15 +0000 (23:01 -0700)]
Merge "Add content description to zenmode" into pi-dev am:
adc1534453
am:
c320298e81
Change-Id: I4822d26b1cf5667ae67131422d8f41da6b2ad28b
Lucas Dupin [Tue, 22 May 2018 05:53:27 +0000 (22:53 -0700)]
Merge "Add content description to zenmode" into pi-dev
am:
adc1534453
Change-Id: I5cd398157fb641b88145a0f90766161e5b8124f0
TreeHugger Robot [Tue, 22 May 2018 05:44:33 +0000 (05:44 +0000)]
Merge "Add content description to zenmode" into pi-dev
Jian Jin [Tue, 22 May 2018 05:01:20 +0000 (22:01 -0700)]
Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev am:
90101793e5
am:
14fe430904
Change-Id: I68e02822b787c7397117ab6d14e2fe6d1db9b98f
Jian Jin [Tue, 22 May 2018 04:52:31 +0000 (21:52 -0700)]
Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev
am:
90101793e5
Change-Id: I19579cada6c7505a4691e81e693f1f1cabc45259
Jian Jin [Tue, 22 May 2018 04:43:21 +0000 (04:43 +0000)]
Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev
Tracy Zhou [Tue, 22 May 2018 03:47:06 +0000 (20:47 -0700)]
Merge "Show swipe-up tip with exponential backoff" into pi-dev am:
ef59d80730
am:
cae4ba1fd1
Change-Id: I23baf2d5195aa440b3f1771c55b0a70c676bd46e
Tracy Zhou [Tue, 22 May 2018 03:39:22 +0000 (20:39 -0700)]
Merge "Show swipe-up tip with exponential backoff" into pi-dev
am:
ef59d80730
Change-Id: I5b87b8eb375377540cb4fbe3dc55a02e71a5e96f
TreeHugger Robot [Tue, 22 May 2018 03:28:13 +0000 (03:28 +0000)]
Merge "Show swipe-up tip with exponential backoff" into pi-dev
Tracy Zhou [Mon, 21 May 2018 22:30:31 +0000 (15:30 -0700)]
Show swipe-up tip with exponential backoff
Change-Id: Icd32c0bd98623173322e5e33bd5400e679a01a10
Fixes:
79985309
Test: Manual test
Jian Jin [Mon, 21 May 2018 22:20:40 +0000 (15:20 -0700)]
Bugfix: PIN keyguard is clipped in Car
Car is a multi-user system. There's a cancel button on the Keyguard
that allows the user to cancel the Keyguard to go back to user
switcher. Because different user may have different security mode,
the container must be resized when the security mode changes. The fix
is to destroy the old bouncer view on cancel.
Screenshot of clipped view: https://screenshot.googleplex.com/0VWdDtrLkAr
Fix:
79202566
Test: In the head unit
Change-Id: Ife33c53785ed96778f08c8f5886885e2b9d29749
Lucas Dupin [Tue, 22 May 2018 01:22:04 +0000 (18:22 -0700)]
Merge "Bouncer shouldn't be translated when occluded" into pi-dev am:
553fc8b8e0
am:
76bb2c0b59
Change-Id: Ibd5f92d3e11a28c1d7dbecbf4e702ccc0e294ba8
Lucas Dupin [Tue, 22 May 2018 01:13:27 +0000 (18:13 -0700)]
Merge "Bouncer shouldn't be translated when occluded" into pi-dev
am:
553fc8b8e0
Change-Id: I74a1d7a75b4b632cdacc6fbbe8cd88cea449f0f1
Remi NGUYEN VAN [Tue, 22 May 2018 00:58:19 +0000 (09:58 +0900)]
Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.
Bug: b/
79499239
Test: runtest frameworks-net
Change-Id: I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299
TreeHugger Robot [Tue, 22 May 2018 00:59:29 +0000 (00:59 +0000)]
Merge "Bouncer shouldn't be translated when occluded" into pi-dev
Lucas Dupin [Tue, 22 May 2018 00:58:05 +0000 (17:58 -0700)]
Add content description to zenmode
Test: manual
Change-Id: Ic478e8a6fcd2088d198b2cee2e70ab8376b4709d
Fixes:
79686343
Lucas Dupin [Tue, 22 May 2018 00:47:23 +0000 (17:47 -0700)]
Merge "Measure text in 1 pass" into pi-dev am:
322d934e02
am:
fe5aa5bb54
Change-Id: I94d426f443d2b5adde0b96b9c55a71025f5f4e39
Jaewan Kim [Tue, 22 May 2018 00:41:21 +0000 (17:41 -0700)]
Merge "Differentiate MediaController in a process for MediaSession" into pi-dev am:
43688e8f2f
am:
a31254bde1
Change-Id: I6b10eb78bf428cd93977d3075ae7a200b53bf92c
Lucas Dupin [Tue, 22 May 2018 00:36:02 +0000 (17:36 -0700)]
Merge "Measure text in 1 pass" into pi-dev
am:
322d934e02
Change-Id: Iee665e6974331ea343fc84ae0643640e9b904d9f
Jaewan Kim [Tue, 22 May 2018 00:29:35 +0000 (17:29 -0700)]
Merge "Differentiate MediaController in a process for MediaSession" into pi-dev
am:
43688e8f2f
Change-Id: I8deb492fa82dcb2bec04d85a65a0aa267be830a4
Lucas Dupin [Tue, 22 May 2018 00:16:36 +0000 (00:16 +0000)]
Merge "Measure text in 1 pass" into pi-dev
Matthew Fritze [Tue, 22 May 2018 00:12:35 +0000 (17:12 -0700)]
Merge "Add utility methods to AmbientDisplayConfig" into pi-dev am:
758cfd63db
am:
be16482ab0
Change-Id: Id43a4f0aa2c519013edd065185ec6cb6f688478c
TreeHugger Robot [Tue, 22 May 2018 00:11:49 +0000 (00:11 +0000)]
Merge "Differentiate MediaController in a process for MediaSession" into pi-dev
Matthew Fritze [Mon, 21 May 2018 23:52:58 +0000 (16:52 -0700)]
Merge "Add utility methods to AmbientDisplayConfig" into pi-dev
am:
758cfd63db
Change-Id: Ie4b339c20f7392211142152b34584683072c191d
Lucas Dupin [Mon, 21 May 2018 23:44:28 +0000 (16:44 -0700)]
Bouncer shouldn't be translated when occluded
Only checking if the bouncer should be scrimmed isn't enough
since it might have been initialized for performance reasons,
but is hidden at the bottom of the keyguard.
Change-Id: If92083e2c385d51febe0ec3a5e5d3484476caf81
Fixes:
80101176
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: manual
Lucas Dupin [Mon, 21 May 2018 23:37:40 +0000 (16:37 -0700)]
Merge "Pulse state should always show ambient wallpaper" into pi-dev am:
52ecba88d1
am:
7b38e21532
Change-Id: I2c67cc668d082d14bd8abedb2e0f14d1720319ec
TreeHugger Robot [Mon, 21 May 2018 23:37:24 +0000 (23:37 +0000)]
Merge "Add utility methods to AmbientDisplayConfig" into pi-dev
Yifan Hong [Mon, 21 May 2018 23:24:31 +0000 (16:24 -0700)]
Merge "Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev am:
908b548f3c" into pi-dev-plus-aosp
am:
31abe4a341
Change-Id: I289097927850fbc857783c1e87796cbda734f668
Colin Cross [Mon, 21 May 2018 23:12:41 +0000 (16:12 -0700)]
Merge "Use AAPT2 for modules with manifest validation errors" am:
59fa1bcf69 am:
0cdc6edb51
am:
9684a40a9c
Change-Id: I121e92d4356740d3a1112ff3955b0a7893a7a952
Beverly [Mon, 21 May 2018 23:06:40 +0000 (16:06 -0700)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev am:
88bdf18545
am:
94fe7b3cd7
Change-Id: Iae7e84290de38be666bdb372c9025ceefb90b53b
Colin Cross [Mon, 21 May 2018 22:46:00 +0000 (15:46 -0700)]
[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation" am:
61f92e7e13 am:
8fd234045d -s ours
am:
986e5160f6 -s ours
Change-Id: I7de85849261be00a32f8c1d0165a27815cc356ea
Adam Lesinski [Mon, 21 May 2018 22:41:01 +0000 (15:41 -0700)]
[automerger skipped] AAPT2: Better error messages for ManifestFixer am:
b2b20f26db am:
6671fe5c8e -s ours
am:
04fe1bd0de -s ours
Change-Id: Iaa2d79b697246497c5e694ae44138be6c3b34730
Lucas Dupin [Mon, 21 May 2018 22:39:40 +0000 (15:39 -0700)]
Merge "Pulse state should always show ambient wallpaper" into pi-dev
am:
52ecba88d1
Change-Id: I9dfcdf1c70fc3ee2059cc5e9312458bcfa07f0a4
Android Build Merger (Role) [Mon, 21 May 2018 22:35:35 +0000 (22:35 +0000)]
Merge "Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev am:
908b548f3c" into pi-dev-plus-aosp
Yifan Hong [Mon, 21 May 2018 22:35:13 +0000 (15:35 -0700)]
Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev
am:
908b548f3c
Change-Id: Id568f13a8f143e0c05c0efe482e0a05158127114
Colin Cross [Mon, 21 May 2018 22:34:27 +0000 (15:34 -0700)]
Merge "Use AAPT2 for modules with manifest validation errors" am:
59fa1bcf69
am:
0cdc6edb51
Change-Id: I89da1d4e4a4ba1a9aba87f0c66f459e4ed39b82b
Adam Lesinski [Mon, 21 May 2018 22:31:12 +0000 (15:31 -0700)]
[automerger skipped] AAPT2: Differentiate between Android and Java package names am:
ef506c73bb am:
5cc5fdd0dc -s ours
am:
937001be50 -s ours
Change-Id: I52e938af2ded636732a50327662083c02274660d
Beverly [Mon, 21 May 2018 22:30:15 +0000 (15:30 -0700)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev
am:
88bdf18545
Change-Id: I9b4798307a260ffaeb7bc26e970fdd7c79d90910
Adam Lesinski [Mon, 21 May 2018 22:22:36 +0000 (15:22 -0700)]
[automerger skipped] Merge "Change ownership of AAPT2 and libandroidfw" am:
1e0a5d397d am:
06eb87271d -s ours
am:
d3be7501bf -s ours
Change-Id: I1a3e865f91288c9ec9118c018d1ed65ca3d7933f
Colin Cross [Mon, 21 May 2018 22:20:43 +0000 (15:20 -0700)]
[automerger skipped] Merge changes from topic "aapt2-warn-manifest-validation" am:
61f92e7e13
am:
8fd234045d -s ours
Change-Id: Ic87193813a8f87ef37556026b0e19f2632464112
TreeHugger Robot [Mon, 21 May 2018 22:18:47 +0000 (22:18 +0000)]
Merge "Pulse state should always show ambient wallpaper" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 22:18:42 +0000 (22:18 +0000)]
Merge "FingerprintService: requires ro.product.first_api_level" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 22:17:52 +0000 (22:17 +0000)]
Merge "Setup mAreChannelsBypassingDnd from notifPolicy" into pi-dev
Adam Lesinski [Mon, 21 May 2018 22:16:56 +0000 (15:16 -0700)]
[automerger skipped] AAPT2: Better error messages for ManifestFixer am:
b2b20f26db
am:
6671fe5c8e -s ours
Change-Id: Ibf21d14fd06c84ec2bcf92e58b8e4c95659cf333
Adam Lesinski [Mon, 21 May 2018 22:12:18 +0000 (15:12 -0700)]
[automerger skipped] AAPT2: Differentiate between Android and Java package names am:
ef506c73bb
am:
5cc5fdd0dc -s ours
Change-Id: Ie50856b30994185dbf5ff706349296efcac5d24d
Dianne Hackborn [Mon, 21 May 2018 19:31:51 +0000 (12:31 -0700)]
Add new hidden-for-now AppOpsManager APIs to greylist.
Bug:
78480444
Test: manual
Change-Id: I2a9c2040279df3d875b96edb4a686006f5114a76
Merged-In: I2a9c2040279df3d875b96edb4a686006f5114a76
Dianne Hackborn [Mon, 21 May 2018 19:31:51 +0000 (12:31 -0700)]
Add new hidden-for-now AppOpsManager APIs to greylist.
Bug:
78480444
Test: manual
Change-Id: I2a9c2040279df3d875b96edb4a686006f5114a76
Lucas Dupin [Mon, 21 May 2018 21:41:52 +0000 (14:41 -0700)]
Measure text in 1 pass
Before we were setting the text again using setText, and this
would trigger a second measure/layout pass, which is unnecessary.
Now we're using the same mesure pass to calculate the view's
best line break.
Fixes:
79714443
Test: manual. set various meeting names animated or static
Change-Id: Ia911fae8f820b703ca385a10211073bae37f3258
Adam Lesinski [Mon, 21 May 2018 22:08:25 +0000 (15:08 -0700)]
[automerger skipped] Merge "Change ownership of AAPT2 and libandroidfw" am:
1e0a5d397d
am:
06eb87271d -s ours
Change-Id: I01c79f94b57cdd64a97670e4b7a2e163000487ac
Jordan Liu [Mon, 21 May 2018 22:07:39 +0000 (15:07 -0700)]
Merge "Change directory where apns-conf.xml is stored" am:
d25198f62f am:
d15962b260
am:
0bdaa497a5
Change-Id: Ia2f81c8a006df622bfce244693eb883acb123cf2
Colin Cross [Mon, 21 May 2018 21:51:40 +0000 (14:51 -0700)]
Merge "Use AAPT2 for modules with manifest validation errors"
am:
59fa1bcf69
Change-Id: I1ae5e646a5c519860450ef1bbef72aacb2c1e915
Jordan Liu [Mon, 21 May 2018 21:48:41 +0000 (14:48 -0700)]
Merge "Change directory where apns-conf.xml is stored" am:
d25198f62f
am:
d15962b260
Change-Id: Ib0416da63f166b5e3a0ac2ef4210d92eaa39a9ab
Colin Cross [Mon, 21 May 2018 21:40:05 +0000 (14:40 -0700)]
Merge changes from topic "aapt2-warn-manifest-validation"
am:
61f92e7e13
Change-Id: Idb04f6750abd4dbdce62979794f68833a39e4c3b
Adam Lesinski [Mon, 21 May 2018 21:35:28 +0000 (14:35 -0700)]
AAPT2: Better error messages for ManifestFixer
am:
b2b20f26db
Change-Id: I1d661e2d11e929ae0930863d5ed2e344c97a9e28
Yifan Hong [Mon, 21 May 2018 19:38:10 +0000 (12:38 -0700)]
FingerprintService: requires ro.product.first_api_level
Test: fingerprint registration works
Bug:
79950359
Change-Id: I1c75b9258a5c63b23fa2c546f002a596c9d55dc3
Adam Lesinski [Mon, 21 May 2018 21:30:41 +0000 (14:30 -0700)]
AAPT2: Differentiate between Android and Java package names
am:
ef506c73bb
Change-Id: I7b5dd69303106eba5959684dc3b6a4af24876c94
Adam Lesinski [Mon, 21 May 2018 21:24:37 +0000 (14:24 -0700)]
Merge "Change ownership of AAPT2 and libandroidfw"
am:
1e0a5d397d
Change-Id: I3a3dcce247b9eae100df4b3b6a89b02ef163e87d
Jordan Liu [Mon, 21 May 2018 21:20:34 +0000 (14:20 -0700)]
Merge "Change directory where apns-conf.xml is stored"
am:
d25198f62f
Change-Id: I33db5a97978e17d82da98344c25788fc3bb42e89
Lucas Dupin [Fri, 18 May 2018 19:57:47 +0000 (12:57 -0700)]
Pulse state should always show ambient wallpaper
Otherwise wallpaper wouldn't be set to AOD when the device pulses
and always on is off.
Bug:
78606979
Test: manual
Test: atest packages/SystemUI/tests/src/com/android/systemui/doze/DozeWallpaperStateTest.java
Change-Id: Ic40c18252cd6cb06ff6fd0d79ec3f1de16a1add5
Christopher Ferris [Mon, 21 May 2018 21:14:10 +0000 (21:14 +0000)]
Merge "Remove unnecessary references to libunwind."
Ying Zheng [Mon, 21 May 2018 21:02:40 +0000 (14:02 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev am:
ab38e73af6
am:
ffcd82cad0 -s ours
Change-Id: I9148f59b3abb6fa246d4025700e06d4d1d1ac8ea
Beverly [Mon, 21 May 2018 20:14:15 +0000 (16:14 -0400)]
Setup mAreChannelsBypassingDnd from notifPolicy
Test: atest RankingHelperTest
Change-Id: I34d9c8dfb5924bab0e496e37d5b93715c48b78ad
Fixes:
80078295
Ying Zheng [Mon, 21 May 2018 20:54:58 +0000 (13:54 -0700)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
am:
ab38e73af6
Change-Id: I99bed9c05a1cb49757f3f330d672f6dc4d10615f
Stanley Tng [Mon, 21 May 2018 20:50:20 +0000 (13:50 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev am:
aef6efeef5
am:
898361c1c4
Change-Id: I4a9b9c0c0cde059e3de2d4184e5a43dc445d9a69
Ying Zheng [Mon, 21 May 2018 20:44:23 +0000 (20:44 +0000)]
Merge "DO NOT MERGE - Switch user picker/switcher to use CarUserManagerHelper." into pi-dev
Stanley Tng [Mon, 21 May 2018 20:39:49 +0000 (13:39 -0700)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
am:
aef6efeef5
Change-Id: Ic4ac46d5de65f83ca9e5b27bef44de17c5b94fe8
Mike Digman [Mon, 21 May 2018 20:35:19 +0000 (13:35 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev am:
4b0351d53f
am:
19e32a0e63
Change-Id: I92ddc0d19b3eb72973064900416892b18e505287
Mike Digman [Mon, 21 May 2018 20:25:56 +0000 (13:25 -0700)]
Merge "Extend rotation button timeout duration" into pi-dev
am:
4b0351d53f
Change-Id: Ia6c3008ac77389e9e04a9ce1cab7d0a49c6d29d3
Svet Ganov [Mon, 21 May 2018 20:25:50 +0000 (13:25 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev am:
c81ed627ab
am:
13a27a82a2
Change-Id: Ib7645f1b350ba0e7ed571eb98e739d0a31c4e435
Svet Ganov [Mon, 21 May 2018 20:20:56 +0000 (13:20 -0700)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
am:
c81ed627ab
Change-Id: I7fe9c3d9eb3f291698501ef23fdd449f41d0e3d1
Suprabh Shukla [Mon, 21 May 2018 20:20:37 +0000 (13:20 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev am:
d0897f2b65
am:
485cdce1ca
Change-Id: I6f60f14a705e354fab5f08382a146be7f9dd9f2d
TreeHugger Robot [Mon, 21 May 2018 20:20:31 +0000 (20:20 +0000)]
Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
Matthew Fritze [Mon, 21 May 2018 20:12:36 +0000 (13:12 -0700)]
Add utility methods to AmbientDisplayConfig
The added utility methods are to enable increased
granularity in determinining the availability of gesture
settings dependant on Always on Display.
Bug:
79779562
Test: robotests
Change-Id: Ib54a867ca554d44ee4190706805fa8545aec9fa0
Suprabh Shukla [Mon, 21 May 2018 20:11:40 +0000 (13:11 -0700)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
am:
d0897f2b65
Change-Id: Ia624b12b32d06b7e341f7023231000ffb1fb530b
Svetoslav Ganov [Mon, 21 May 2018 20:11:12 +0000 (13:11 -0700)]
Merge "Make RemoteCallback test API" into pi-dev am:
a757fd7827
am:
573a696f8f
Change-Id: Iab9be37d714d1d1b8eec032d9dabbcd5cb056834
Mike Digman [Mon, 21 May 2018 20:09:24 +0000 (20:09 +0000)]
Merge "Extend rotation button timeout duration" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 20:04:51 +0000 (13:04 -0700)]
Merge "Make RemoteCallback test API" into pi-dev
am:
a757fd7827
Change-Id: Iea481e8a4716bddf48a64d9370d248ffa7871158
TreeHugger Robot [Mon, 21 May 2018 20:03:10 +0000 (20:03 +0000)]
Merge "Allow UiAutomation being used off the main thread" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev
Svetoslav Ganov [Mon, 21 May 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Make RemoteCallback test API" into pi-dev
Treehugger Robot [Mon, 21 May 2018 19:53:38 +0000 (19:53 +0000)]
Merge "Use AAPT2 for modules with manifest validation errors"
Colin Cross [Fri, 18 May 2018 16:50:29 +0000 (09:50 -0700)]
Use AAPT2 for modules with manifest validation errors
Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.
Bug:
79755007
Test: m checkbuild
Change-Id: I357fcba75909495ba2b46b9ed1b532e65fee3fe1
Colin Cross [Mon, 21 May 2018 19:52:24 +0000 (19:52 +0000)]
Merge changes from topic "aapt2-warn-manifest-validation"
* changes:
AAPT2: treat manifest validation errors as warnings when asked
AAPT2: Better error messages for ManifestFixer
AAPT2: Differentiate between Android and Java package names
OSDN Git Service
