Automerger Merge Worker
16fb6dd4b5
Merge "Merge "Add importance ring animation on convo priority change" into rvc-dev am: 80d5c61da5 am: 8cb827b044 am: 1eb955461a" into rvc-qpr-dev-plus-aosp am: 52e427f01b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739864
Change-Id: Id4f36143a3a0193759c651d142ff776f5589ff8b
2020-06-09 16:15:48 +00:00
TreeHugger Robot
26e09017ac
Merge "Add importance ring animation on convo priority change" into rvc-dev am: 80d5c61da5 am: 8cb827b044 am: 1eb955461a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739864
Change-Id: If4cc68635a5d3c66d9004d4621beda4e5503b8f3
2020-06-09 16:01:07 +00:00
TreeHugger Robot
80d5c61da5
Merge "Add importance ring animation on convo priority change" into rvc-dev
2020-06-09 15:33:55 +00:00
TreeHugger Robot
0b2dbedeaa
Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev am: b121512580 am: 4f93e9c80c am: f3b9965750 am: bb8e0b922a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11686078
Change-Id: Ife20398017639b41019d3ee58e3179cf31b3da2e
2020-06-09 14:27:19 +00:00
TreeHugger Robot
f3b9965750
Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev am: b121512580 am: 4f93e9c80c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11686078
Change-Id: I37a0e10e7b9d84e2411636fdbfbbb43a9a6d2e8c
2020-06-09 14:08:44 +00:00
TreeHugger Robot
b121512580
Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev
2020-06-09 13:41:30 +00:00
Ming-Shin Lu
6ecbf08772
Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains
...
When we tried CL[1] to fix Gboard Translation UI dialog dismissed that
keeping the served view when focused to the next window,
although we can skip starting new input when the window focused back as
the behavior of Q,
However, we overlooked in R, IME insets will rely on IMS#reportStartInput
to get the updated IME input target, which will out of sync for the above
case.
To fix this regression, we report the next window focus gain
to IMMS with WINDOW_FOCUS_GAIN_REPORT_ONLY when the next focused view is
same as current served view and the served input connection remains.
so that in IMMS side won't get StartInputFlags.INITIAL_CONNECTION flags
to set restarting as false when calling IInputMethod#startInput to IMS,
and in IMS side will still call reportStartInput to WMS for updating
IME input target without additional onFinishInputView callback to
client.
[1]: I8d4fff94ba9313b773bc27fcbd019cc88580d3e9
Fix: 152373385
Bug: 155781821
Test: atest CtsInputMethodTestCases
Test: manual, make sure Bug 155781821 comment #10 works:
1) Launch video call in Hangouts.
2) End call.
3) Click on the text box.
4) Expect Soft-Keyboard shown
Test: make sure not break Bug 148489857 and Bug 148788569, following
auto / manual test to verify:
- Auto: atest FocusHandlingTest#testKeyboardStateAfterImeFocusableFlagChanged
- Manual:
1) Build / install EditTextVariations
2) Select menu -> Direct-Reply, make sure Notification comes up.
3) Tap EditText on Notification, verify soft-keyboard is visible.
Change-Id: I45a9814d812ad906f417c24200fd4219959e2423
2020-06-09 13:48:15 +08:00
Steve Elliott
8b4929dbbf
Add importance ring animation on convo priority change
...
Bug: 157480039
Test: manual
Change-Id: I0c3b2a857c871fc344705f98aa8463e7de0c4b6b
2020-06-08 22:41:29 -04:00
Joanne Chung
83ebf36a81
Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 am: 4a235e4bf2 am: d853673b5c am: 1d930502f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902
Change-Id: I5fc69b553035d1de9932776ee98f5ecc999723b0
2020-06-09 01:09:13 +00:00
Joanne Chung
d853673b5c
Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804eb2 am: 4a235e4bf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11489902
Change-Id: I229a595052b53349a6a6ddab4df888e219afb5ef
2020-06-09 00:48:26 +00:00
Joanne Chung
9856804eb2
Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev
2020-06-09 00:21:44 +00:00
Daniel Sandler
cc24f7860f
Merge "Show the nearby chip for images and files too." into rvc-dev am: bb2d9a52c1 am: fe25cc3bb6 am: 4b2314666f am: 07a70e3892
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11756600
Change-Id: I69354950f6a3171aa7ef7335df012ce1a1749aad
2020-06-08 20:53:04 +00:00
Daniel Sandler
07a70e3892
Merge "Show the nearby chip for images and files too." into rvc-dev am: bb2d9a52c1 am: fe25cc3bb6 am: 4b2314666f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11756600
Change-Id: Ide0b5d96b60d1d21294a57a347953facc43fa249
2020-06-08 20:38:00 +00:00
Daniel Sandler
10408630be
Merge "Show the nearby chip for images and files too." into rvc-dev am: bb2d9a52c1 am: fe25cc3bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11756600
Change-Id: I10461c29da2c960ce13ae02fabb584c81f75377f
2020-06-08 20:24:04 +00:00
Daniel Sandler
bb2d9a52c1
Merge "Show the nearby chip for images and files too." into rvc-dev
2020-06-08 20:11:04 +00:00
Treehugger Robot
986950e0b0
Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting" am: 907124607f am: 5f016c8deb am: b736478a80 am: 2d8aceac0a am: 12aefae37e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321018
Change-Id: I2da4e9d66318454e8fcc21dac4818e4e7bc26a4a
2020-06-08 17:39:02 +00:00
Treehugger Robot
b736478a80
Merge "KernelCpuUidBpfMapReader: Verify presence of Uids before deleting" am: 907124607f am: 5f016c8deb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321018
Change-Id: I376684b31398743e5c873e8ccc874d0c6a1c8c89
2020-06-08 16:19:19 +00:00
Joanne Chung
c6adc68368
Handle SyncResultReceiver.TimeoutException
...
1.Change SyncResultReceiver.TimeoutException to checked exception
2.Handle the SyncResultReceiver.TimeoutException in AutofillManager,
ContentCaptureManager, ContentSuggestionsManager
3.Fix the bug we should throw e.rethrowFromSystemServer()
Bug: 156044027
Test: atest CtsAutoFillServiceTestCases
Test: atest ContentSuggestionsManagerTest
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I959d2aca2b80866c076fae2520de66c123f5367d
2020-06-08 14:53:45 +08:00
TreeHugger Robot
5cc6aae63b
Merge "Product partition must have limited system configs."
2020-06-08 04:17:33 +00:00
Steve Elliott
cb1af1e0be
Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af am: ce90e8037d am: 1557f3e094 am: 454e0f2108
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185
Change-Id: Ied6eaf76018356f682c495c96ef1b279a927e463
2020-06-06 16:09:01 +00:00
Svetoslav Ganov
f74f28160d
Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: d9f92e4666 am: deb797776a am: 2191f1c2e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376
Change-Id: I4405ec52394c0093d0f37da512e5a2fd827a4e1b
2020-06-06 15:49:46 +00:00
Steve Elliott
1557f3e094
Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af am: ce90e8037d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185
Change-Id: Ic3f5aba0428e22e1124b2f7f1cc76b803e7202dd
2020-06-06 15:41:43 +00:00
Steve Elliott
eec7f12366
Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11727185
Change-Id: I43fc706e88d78547aed43737ffadcb93b54da0bf
2020-06-06 15:29:19 +00:00
Svetoslav Ganov
deb797776a
Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f am: d9f92e4666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376
Change-Id: Iba05ad9051487dfe285997e97b5075579602a88d
2020-06-06 15:21:45 +00:00
Steve Elliott
05e10b59af
Merge "Fix missing icon for one-to-one convos" into rvc-dev
2020-06-06 15:12:04 +00:00
Svetoslav Ganov
2d56a15699
Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba38f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11747376
Change-Id: I3cd684c2f48b456efe4831a1bcb1dbffa9857c8c
2020-06-06 15:06:03 +00:00
Svetoslav Ganov
0ce4fba38f
Merge "Correctly offset app op history on reboot" into rvc-dev
2020-06-06 14:50:03 +00:00
Jing Ji
79bb2eec20
Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699 am: 8143d27be9 am: a281c93ab1 am: 701dddc99a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049
Change-Id: I9fe283219945a9b75da4a68e29623b911b8fdd0f
2020-06-05 23:47:47 +00:00
Jing Ji
701dddc99a
Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699 am: 8143d27be9 am: a281c93ab1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049
Change-Id: I01d5a7ae0da8859686105e83bce88e81150138b3
2020-06-05 23:33:25 +00:00
Jing Ji
8013aa3041
Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699 am: 8143d27be9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049
Change-Id: Ia4ed833e1f0627f68a138b100acbc4b185ba24f1
2020-06-05 23:20:58 +00:00
Jing Ji
d948fca5dd
Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev am: d29532e699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11725049
Change-Id: I0b5ee05a425ae7904eb361e79664800271e52f6d
2020-06-05 23:18:54 +00:00
Jing Ji
d29532e699
Merge "Use the UID as the package name in procstat assoc proto dump" into rvc-dev
2020-06-05 23:16:36 +00:00
Mike Digman
db5a5c8e1b
Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608 am: 705e18ad01 am: b965c06dc9 am: f076a8d745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866
Change-Id: I991562738bccc2375a3e5648299e0aefa9d78a6e
2020-06-05 20:02:52 +00:00
Miranda Kephart
769ccfd7b5
Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621 am: ec217d20d0 am: 729073e183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868
Change-Id: I515b6382afc49993f3c200b348402dce9395f25f
2020-06-05 19:56:47 +00:00
Mike Digman
f076a8d745
Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608 am: 705e18ad01 am: b965c06dc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866
Change-Id: I36ead9a3deac1ecd951c49da9ac28dbdb0ece507
2020-06-05 19:48:45 +00:00
Miranda Kephart
729073e183
Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621 am: ec217d20d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868
Change-Id: I8c2199f4312d1f07dcc1997deb927a2ad992a23d
2020-06-05 19:46:29 +00:00
Mike Digman
3e7995dfb0
Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608 am: 705e18ad01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866
Change-Id: I99a6ed7dd8d3979fab4e9a7f3465041f972e5eca
2020-06-05 19:30:24 +00:00
Mike Digman
2fd7f7c3a8
Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev am: 5aa8394608
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739866
Change-Id: I1e7c5bfc726f11e992df8fc37a5eb703d06e9572
2020-06-05 19:29:02 +00:00
Miranda Kephart
166b9e0450
Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf am: 11e31f8621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868
Change-Id: I35d492f5dd522ff7eafeea8d5c984e4a19e69455
2020-06-05 19:28:05 +00:00
Mike Digman
5aa8394608
Merge "Make Sharesheet group and pin menu match material, redlines" into rvc-dev
2020-06-05 19:19:41 +00:00
Miranda Kephart
762b9fb13d
Merge "Only show error if screenshot process dies within timeout period" into rvc-dev am: 3a51a85aaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739868
Change-Id: I72b2353a5bfe4961b74776e07f5db33dd3a777ef
2020-06-05 19:09:58 +00:00
Miranda Kephart
3a51a85aaf
Merge "Only show error if screenshot process dies within timeout period" into rvc-dev
2020-06-05 18:55:08 +00:00
TreeHugger Robot
1968736265
Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d8165 am: a19bea8b0a am: 967113ba8e am: f5d92a43b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11755478
Change-Id: Ie97fcdaa30f58469673d8f315dfebea80f86d0e6
2020-06-05 18:32:20 +00:00
Automerger Merge Worker
65bc35b9da
Merge "Merge "Shouldn't turn on other accessibility features in SuW." into rvc-dev am: c9f8b52b26 am: d2ac978388 am: e1a1d01b4e" into rvc-qpr-dev-plus-aosp am: a556847bde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716081
Change-Id: I4de543483de79358ecaa4b8a0da9f43ba800eed9
2020-06-05 18:14:57 +00:00
TreeHugger Robot
73f9914b28
Merge "Add test for tapping Work share tab when work profile is off" into rvc-dev am: 8f27cd8e55 am: 8159948707 am: 96bd68b04b am: 7f7325a070
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734120
Change-Id: I6d02f2f94e0366d7b157ef84d453d9f5420b1938
2020-06-05 18:14:26 +00:00
Antoan Angelov
fc61877728
Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c63b am: 8b60025767 am: 1e6c00c862 am: 286bfd4e1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734105
Change-Id: Ice58dd460f1d67058d26e0baa228ba2fc7844b73
2020-06-05 18:12:05 +00:00
Felipe Leme
49e0ea7d72
Merge "Added command / binder method to temporarily disable VoiceInteraction." into rvc-dev am: df98b27008 am: 898e01c95b am: 6f6a25d347 am: ca8d227f31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11625271
Change-Id: Icb667ac6d86c22b8b850d4433d02e90601bc811d
2020-06-05 18:06:37 +00:00
Mike Digman
ad2e9a0a57
Make Sharesheet group and pin menu match material, redlines
...
Requires wholesale creation of dialog layout. Using a fixed
width approach.
Test: manual
Bug: 152978014
Fixes: 158023059
Change-Id: Ifcff21b2f999839c3eba601a2ee96a08677e1267
2020-06-05 10:18:43 -07:00
Svet Ganov
185ddf644b
Correctly offset app op history on reboot
...
The offset was computed based off the offset represented by
the most recent historical file while we have to use the time
this file was written.
Also now we persist the history on reboot and shutdown,
significantly minimizing the possibility of data loss.
Added test API to emulate reboot of the history to allow for
precise and tightly controlled test to prevent flakes due to
boot time deviations.
Test: atest android.app.appops.cts.HistoricalAppopsTest#testRebootHistory
Fixes:156853195
Change-Id: I4142371f8bc2b1d710cc8c300e7e79cb03764c04
2020-06-05 09:55:27 -07:00
Dan Sandler
b18b59fd58
Show the nearby chip for images and files too.
...
This revealed that we weren't initializing the nearby intent
from the original intent, so that's fixed too. This should
ensure that flags and extras from the original intent make
their way to the available and installed nearby component.
Test: Share (an image and a non-image) from DocumentsUI
Fixes: 155487375
Fixes: 155676993
Change-Id: If0c0b754a066b0ec439a866de3eae84caca7b793
2020-06-05 12:45:14 -04:00