Commit Graph

508996 Commits

Author SHA1 Message Date
TreeHugger Robot
8a478317f2 Merge "Add details to VibrationEffect waveform documentation" into rvc-dev am: 19dd14d76a am: bdac8459fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837599

Change-Id: I9c860c9ee7d6b8add3d169cf0af9e3c6172f3f30
2020-06-11 17:57:04 +00:00
Matt Casey
78e8d33b2d Merge "Add FLAG_ALT_FOCUSABLE_IM to screenshot window." into rvc-dev am: b20914d938 am: e760e271ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835320

Change-Id: I3fa87d865405b42f72fc8e2826cea097bb1f436e
2020-06-11 17:56:57 +00:00
Automerger Merge Worker
df31aabab3 Merge "Merge "Remove legacy screenshot notifications flow" into rvc-dev am: 1e9db44dc9 am: 288382cc2a" into rvc-d1-dev-plus-aosp 2020-06-11 17:56:49 +00:00
Winson Chung
d0a392e997 Merge "Add temporary logging for stuck nav button feedback" into rvc-dev am: f587b12e36 am: cacfeb4597
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11834007

Change-Id: Ic09e24464599643ae517c4f50a7ebd566b1a3081
2020-06-11 17:56:40 +00:00
Miranda Kephart
ed4981b856 Merge "Remove legacy screenshot notifications flow" into rvc-dev am: 1e9db44dc9 am: 288382cc2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11826322

Change-Id: Ibc3c8ead3725d19ce0cbfed85694bfa782eb388c
2020-06-11 17:56:33 +00:00
Miranda Kephart
768d315c62 Merge "Remove legacy screenshot notifications flow" into rvc-dev am: 1e9db44dc9 am: 47cfb686da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11826322

Change-Id: Ic9c7eb44a3678527a44f0e19394250526b06ef46
2020-06-11 17:56:26 +00:00
Automerger Merge Worker
ab8d5bad5c Merge "Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c am: 9f8827b566" into rvc-d1-dev-plus-aosp 2020-06-11 17:55:48 +00:00
Joshua Duong
56646d1390 Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c am: 9f8827b566
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829829

Change-Id: Id1c9db16aa0d6114d6ed5d88e11a3d5cd5d4a7a8
2020-06-11 17:55:36 +00:00
TreeHugger Robot
bdac8459fb Merge "Add details to VibrationEffect waveform documentation" into rvc-dev am: 19dd14d76a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837599

Change-Id: Ic47e871ca849268ffaf8e8b759f2ceb9b93d6e48
2020-06-11 17:55:27 +00:00
Joshua Duong
228ea7817a Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c am: 9fc04c68ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829829

Change-Id: Idf5a228c15b4accc68cf967945e2523efc415e57
2020-06-11 17:55:24 +00:00
TreeHugger Robot
19dd14d76a Merge "Add details to VibrationEffect waveform documentation" into rvc-dev 2020-06-11 17:52:05 +00:00
Matt Casey
e760e271ef Merge "Add FLAG_ALT_FOCUSABLE_IM to screenshot window." into rvc-dev am: b20914d938
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835320

Change-Id: Ia21649cd044877550f528681f47a890f08e9e85c
2020-06-11 17:37:40 +00:00
Winson Chung
cacfeb4597 Merge "Add temporary logging for stuck nav button feedback" into rvc-dev am: f587b12e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11834007

Change-Id: I9cd70b0ff1ac929f2dac3cbb74688c15ae8f3474
2020-06-11 17:37:28 +00:00
Miranda Kephart
47cfb686da Merge "Remove legacy screenshot notifications flow" into rvc-dev am: 1e9db44dc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11826322

Change-Id: I486736782099adae6b48c63af98e9eff28073e65
2020-06-11 17:37:08 +00:00
Miranda Kephart
288382cc2a Merge "Remove legacy screenshot notifications flow" into rvc-dev am: 1e9db44dc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11826322

Change-Id: I21b1608a12c27db459b5840eff4081dd25fc040a
2020-06-11 17:37:00 +00:00
Joshua Duong
9fc04c68ee Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829829

Change-Id: I821c9590a01c4890ba9e5967dcdc5bd92fd5ec1a
2020-06-11 17:36:49 +00:00
Joshua Duong
9f8827b566 Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829829

Change-Id: Idc1d7794b59e1f3eb19482e23338da5d631d85d5
2020-06-11 17:36:19 +00:00
Matt Casey
b20914d938 Merge "Add FLAG_ALT_FOCUSABLE_IM to screenshot window." into rvc-dev 2020-06-11 17:35:37 +00:00
Winson Chung
f587b12e36 Merge "Add temporary logging for stuck nav button feedback" into rvc-dev 2020-06-11 17:33:55 +00:00
Miranda Kephart
1e9db44dc9 Merge "Remove legacy screenshot notifications flow" into rvc-dev 2020-06-11 17:28:46 +00:00
Joshua Duong
9e7a8c853c Merge "Reread the tls port on adbd restarts." into rvc-dev 2020-06-11 17:23:00 +00:00
Heemin Seog
4f075af68b Merge "Dismiss panel when requested to close system dialogs" into rvc-dev am: 8808b5a3d3 am: 4a37a23cf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827743

Change-Id: I18a5a1f02ffc0a6473af48c127898f53f006515c
2020-06-11 17:17:07 +00:00
Automerger Merge Worker
9414fac8f2 Merge "Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev am: 934df62467 am: 45100c7c7a" into rvc-d1-dev-plus-aosp 2020-06-11 17:17:02 +00:00
Automerger Merge Worker
57c7d5e2ee Merge "Merge "Dismiss panel when requested to close system dialogs" into rvc-dev am: 8808b5a3d3 am: 4d5104df84" into rvc-d1-dev-plus-aosp 2020-06-11 17:16:57 +00:00
Abodunrinwa Toki
986a3d3490 Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev am: 934df62467 am: 45100c7c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744901

Change-Id: Ib4a54b987f0dd193db5de5aea3f790e510c6fe8a
2020-06-11 17:16:55 +00:00
Automerger Merge Worker
099e709bbe Merge "Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa am: eb7f4f0ed6" into rvc-d1-dev-plus-aosp 2020-06-11 17:16:51 +00:00
Heemin Seog
dccce63c02 Merge "Dismiss panel when requested to close system dialogs" into rvc-dev am: 8808b5a3d3 am: 4d5104df84
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827743

Change-Id: Ie590689c4e101da124c430e1537d65fba6131a02
2020-06-11 17:16:50 +00:00
Automerger Merge Worker
f0a6ee9ad7 Merge "Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev am: 934df62467 am: 57c56e91d8" into rvc-d1-dev-plus-aosp 2020-06-11 17:16:46 +00:00
TreeHugger Robot
e2e959c253 Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa am: eb7f4f0ed6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: I0ba2e69579a39c0a8833c899b00cfa583826b6b9
2020-06-11 17:16:43 +00:00
Automerger Merge Worker
84e1dded21 Merge "Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c5b am: 197b9f52da" into rvc-d1-dev-plus-aosp 2020-06-11 17:16:41 +00:00
Abodunrinwa Toki
8156fb251a Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev am: 934df62467 am: 57c56e91d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744901

Change-Id: Ic4a05b570af049f5f821c24d8a357c4b797bdf84
2020-06-11 17:16:38 +00:00
TreeHugger Robot
6f817d80f4 Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c5b am: 197b9f52da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833788

Change-Id: Ie934272581798e45c233576c78fd82f2a188152d
2020-06-11 17:16:33 +00:00
Heemin Seog
4d5104df84 Merge "Dismiss panel when requested to close system dialogs" into rvc-dev am: 8808b5a3d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827743

Change-Id: Icf83ebdc3a5551503a97b9bb1198ede5df3127d9
2020-06-11 17:16:31 +00:00
TreeHugger Robot
99c911561b Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa am: 1650966ee2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: Ib2cdcb015341e80811d7ca1a3449771c42350042
2020-06-11 17:16:28 +00:00
Heemin Seog
4a37a23cf4 Merge "Dismiss panel when requested to close system dialogs" into rvc-dev am: 8808b5a3d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11827743

Change-Id: I3f3694dab3c74b877b9edca8dd3c97d34834aa90
2020-06-11 17:16:26 +00:00
Abodunrinwa Toki
45100c7c7a Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev am: 934df62467
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744901

Change-Id: I4529c03f482eeb2741f127fdd7b6cc434ba9909e
2020-06-11 17:16:04 +00:00
Abodunrinwa Toki
57c56e91d8 Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev am: 934df62467
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11744901

Change-Id: I0aa43e678345ca9c13742b6aac1b59edc51aa8e2
2020-06-11 17:16:00 +00:00
TreeHugger Robot
d05e1d45a2 Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c5b am: bb1ccc30d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833788

Change-Id: Iacbbecdcc067bea24ca6373330becef3b23a85c4
2020-06-11 17:15:59 +00:00
Heemin Seog
8808b5a3d3 Merge "Dismiss panel when requested to close system dialogs" into rvc-dev 2020-06-11 16:42:53 +00:00
Abodunrinwa Toki
934df62467 Merge "Disable language logging in TextClassifier/TranslateEvent" into rvc-dev 2020-06-11 16:40:13 +00:00
Lais Andrade
ef5d8751e6 Add details to VibrationEffect waveform documentation
Explain the time unit of timings argument and copy explanation of
amplitude values to the summary segments of the javadocs.

Fix: 140846849
Test: N/A
Change-Id: Ia6fd6cb5d0e16076a54f24f7c3d2f3d4ca78d5bd
2020-06-11 16:39:36 +00:00
TreeHugger Robot
eb7f4f0ed6 Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: I10dc8bc64c09190151664a0f7054fbdbfd7ca70d
2020-06-11 16:18:49 +00:00
TreeHugger Robot
1650966ee2 Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: Iab4b9f74f8e492aa0ae527add40acaa6face0ddb
2020-06-11 16:18:40 +00:00
TreeHugger Robot
bb1ccc30d5 Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833788

Change-Id: I4eb56581e855bc5e4dcc54cd5a35dcf6793486be
2020-06-11 16:18:19 +00:00
TreeHugger Robot
197b9f52da Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833788

Change-Id: I12ffa4b36f7afc20567d845796da275a539f4a17
2020-06-11 16:18:16 +00:00
TreeHugger Robot
954574cfaa Merge "Strip formatting from convo senders and title" into rvc-dev 2020-06-11 16:14:44 +00:00
TreeHugger Robot
1933391c5b Merge "wifi: fix incorrect java doc" into rvc-dev 2020-06-11 15:59:15 +00:00
Mark Chien
07564cd44d [automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: d02eb33e41 -s ours
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 d3252e3e61 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092

Change-Id: I9d40c0e0998d238bcde75a1417f1dbac384285d7
2020-06-11 15:45:34 +00:00
TreeHugger Robot
af7ecf7f17 Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 2b92ce540b am: b2660dc13d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11560353

Change-Id: I0d326e4d6903469a6dd398ce4a2c6117c63b1f36
2020-06-11 15:45:20 +00:00
TreeHugger Robot
b77a86bbd5 Merge "Remove getFreeBytes() to fasten queryRoots call." into rvc-dev am: b3967b656d am: d60a648f6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808678

Change-Id: If1ec8a86f592b3ed3e64f70b01a8c4824b00d8da
2020-06-11 15:45:11 +00:00