Automerger Merge Worker
e8391b19da
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp am: dca875c0fb am: c951ec1a65 am: 5c9bd9536e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I49bf16a9dbe94a09528d662c6d7fbb1acb559677
2020-06-03 12:30:40 +00:00
Automerger Merge Worker
6f29ddbd2d
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9" into rvc-qpr-dev-plus-aosp am: a3cfe0e8bb am: 321a0b2c66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I6d2678f8df01036e04e452ab29533cb6638abfa9
2020-06-03 12:29:31 +00:00
Julia Reynolds
e887e27d1e
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 9d22d9582b am: 6cb3469fb2 am: 79d8a6c449
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I95687701615e8c979ef5262795d0da28f5e5b75d
2020-06-03 12:29:14 +00:00
Automerger Merge Worker
5c9bd9536e
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp am: dca875c0fb am: c951ec1a65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: Ia9516891bda9cd39a8c214e5c3529683d9a90676
2020-06-03 12:19:01 +00:00
Automerger Merge Worker
321a0b2c66
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9" into rvc-qpr-dev-plus-aosp am: a3cfe0e8bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I57de0a0d74537e6975b7802cd66a3d33920a6d7d
2020-06-03 12:17:00 +00:00
Julia Reynolds
79d8a6c449
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 9d22d9582b am: 6cb3469fb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I6e73f7e7f6e8a91d69f9aac14ba3b7b6af6c19b0
2020-06-03 12:15:59 +00:00
Automerger Merge Worker
c951ec1a65
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp am: dca875c0fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: Ia8782acb30732df62780c4b8ea1b593ae80631ed
2020-06-03 12:05:38 +00:00
Automerger Merge Worker
a3cfe0e8bb
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9" into rvc-qpr-dev-plus-aosp
2020-06-03 12:03:55 +00:00
Julia Reynolds
6cb3469fb2
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 9d22d9582b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: Id635116c1a8bbda65bfab34c34e36366162e8ce2
2020-06-03 12:03:45 +00:00
Julia Reynolds
25e0bc3aa0
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f am: 09052ac8d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I03ebf0cbc6688f6a3c02ca274277cbc171bf4d5b
2020-06-03 12:03:45 +00:00
Automerger Merge Worker
dca875c0fb
Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de" into rvc-d1-dev-plus-aosp
2020-06-03 11:49:57 +00:00
Julia Reynolds
09052ac8d9
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I0a9776f57778db6ad94e77457033d15ff3415dd1
2020-06-03 11:49:47 +00:00
Julia Reynolds
3e9c05f1d6
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 5a195b89de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I78e1e6007ce102dbb168fcf36a6e3a47ac718198
2020-06-03 11:49:46 +00:00
Julia Reynolds
9d22d9582b
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065 am: 62814ac56f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I24ef690311d847645cbc4bb1dc7dae9210474301
2020-06-03 11:49:39 +00:00
Jakub Pawlowski
f255e418c0
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 50f8ba28d6 am: 5dc5228332 am: fa8c22b565
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: Ie8fda3eb138dec8a791b473ed1b7cf9b3f9905e2
2020-06-03 11:37:06 +00:00
Jakub Pawlowski
ec6db92588
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 2a1b189cde am: 5037d1dafa am: 7f5a929fb7 am: 8fb7d6420e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I28cdea00b1f112e63c2d71c398d384e06cc16821
2020-06-03 11:36:36 +00:00
Jakub Pawlowski
af257bba00
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 54a391f3c5 am: 00e77cc97f am: 28c7b4c0ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I862fe389bb2f609a812bafc0b0ccd438fc7404cb
2020-06-03 11:36:00 +00:00
Julia Reynolds
5a195b89de
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I9ba9ec35fe40ec883c08622b075b2d56040fd1b7
2020-06-03 11:34:32 +00:00
Julia Reynolds
62814ac56f
Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c4065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398
Change-Id: I5776854796a31906783291df89ffea2559f6d4d3
2020-06-03 11:33:47 +00:00
Julia Reynolds
613e3c4065
Merge "Add entry point for conversation settings" into rvc-dev
2020-06-03 11:17:42 +00:00
Jakub Pawlowski
fa8c22b565
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 50f8ba28d6 am: 5dc5228332
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I8ebda2f6c26dc2e72546393d8a458af3f23a1192
2020-06-03 11:14:09 +00:00
Jakub Pawlowski
8fb7d6420e
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 2a1b189cde am: 5037d1dafa am: 7f5a929fb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I054010d9dbb9c2d4ca2c5191e4ff1a985c36356d
2020-06-03 11:13:54 +00:00
Jakub Pawlowski
28c7b4c0ee
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 54a391f3c5 am: 00e77cc97f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I2ba6173a569a935e67d642bf8a4c76032b77e5ea
2020-06-03 11:13:37 +00:00
Jakub Pawlowski
5dc5228332
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 50f8ba28d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I88146870c0d1db5159da76343392a1150276d505
2020-06-03 11:01:04 +00:00
Jakub Pawlowski
7f5a929fb7
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 2a1b189cde am: 5037d1dafa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I471e181f3bae85df2ef058b656e3c691de86c391
2020-06-03 11:00:46 +00:00
Jakub Pawlowski
00e77cc97f
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22 am: 54a391f3c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I319c35bd4338efd7d2b8e90d6643809c4c39b631
2020-06-03 11:00:18 +00:00
Jakub Pawlowski
5037d1dafa
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 2a1b189cde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I7a5539e7308d97b1be351d92434a4bdd92e9370a
2020-06-03 10:48:34 +00:00
Jakub Pawlowski
50f8ba28d6
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I88a9d5851fd510f74ad571f72079bec15c85cb13
2020-06-03 10:48:11 +00:00
Jakub Pawlowski
54a391f3c5
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23 am: 330bf35b22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I219afbcc81e3e3748fccffa6dbd1d741d38f55fd
2020-06-03 10:48:11 +00:00
TreeHugger Robot
8cfabd84c9
Merge "[Wi-Fi] Set the password in the WiFi QR Code sharing page to be copyable" am: f56465f12c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708191
Change-Id: Icbbe4d14859ff1a262e575234ba10ad61aa46a6e
2020-06-03 10:34:15 +00:00
Jakub Pawlowski
330bf35b22
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I613704afab8dc97bfc3d620120d82a6e76c893e9
2020-06-03 10:33:36 +00:00
Jakub Pawlowski
2a1b189cde
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29 am: 3185f80f23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: I7c4a61805def7c6facfcac84cf19341c36a9a92e
2020-06-03 10:33:32 +00:00
Jakub Pawlowski
3185f80f23
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456 am: 103cc7cf29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: Ifbdd0f3dabc0b487bfb5155f786cae6a9980557b
2020-06-03 10:18:46 +00:00
TreeHugger Robot
f56465f12c
Merge "[Wi-Fi] Set the password in the WiFi QR Code sharing page to be copyable"
2020-06-03 10:16:40 +00:00
Jakub Pawlowski
103cc7cf29
Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060
Change-Id: Ib47c1804cbb29942c33152d72e1019c92f0d3856
2020-06-03 09:59:18 +00:00
govenliu
3eef874d38
[Wi-Fi] Set the password in the WiFi QR Code sharing page to be copyable
...
Add new testIsSelectable/focusable/longClickable attributes to the password textview.
Bug: 141132359
Test: manual test.
Change-Id: I5bc1b898bc31d0a486ac5423557596510d813acb
2020-06-03 15:24:33 +08:00
TreeHugger Robot
d529240501
Merge "Change SIM colors to follow GAR standards in dark mode in SIM rename dialog." am: 399bc40250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11506056
Change-Id: Ibd70d6d64152f6682a84837cd086027f2f91b652
2020-06-02 17:17:10 +00:00
TreeHugger Robot
399bc40250
Merge "Change SIM colors to follow GAR standards in dark mode in SIM rename dialog."
2020-06-02 17:02:24 +00:00
Julia Reynolds
6a88e140fe
Add entry point for conversation settings
...
Test: manually launch to this screen
Bug: 155490513
Change-Id: I2f88ef6dc05f04249f516b60680a55d1f26841f1
2020-06-02 12:59:13 -04:00
Bonian Chen
68359844c5
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 4191af1eb1 am: c3bce764fc am: 6a653a8c88 am: 4ddb478f12
...
Original change: undetermined
Change-Id: Icd8cc31624405514af3c7c435dd57e6e88681f91
2020-06-02 15:40:55 +00:00
Bonian Chen
edd45d7836
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 68b19028ee am: b399a6394f am: f43af1a7e9
...
Original change: undetermined
Change-Id: Ic060e536ab7883e2490a022321b4ae5803cd5534
2020-06-02 15:40:26 +00:00
Bonian Chen
46fa8446fa
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 8dfb423714 am: 047f010b63 am: be1d0befc6
...
Original change: undetermined
Change-Id: I5f67a19a9af807647c30fdd819d47f57b6a27658
2020-06-02 15:39:59 +00:00
Bonian Chen
4ddb478f12
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 4191af1eb1 am: c3bce764fc am: 6a653a8c88
...
Original change: undetermined
Change-Id: Ia1f917d1c4b817931955a32991a0f207fafe2ded
2020-06-02 15:27:37 +00:00
Bonian Chen
f43af1a7e9
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 68b19028ee am: b399a6394f
...
Original change: undetermined
Change-Id: I12872882c3d5552f7a40f701d4ca47c3fc1140cf
2020-06-02 15:27:17 +00:00
Bonian Chen
be1d0befc6
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 8dfb423714 am: 047f010b63
...
Original change: undetermined
Change-Id: Ie86c8b2badb581ba2d0cf15981de4943d107544a
2020-06-02 15:26:53 +00:00
Bonian Chen
6a653a8c88
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 4191af1eb1 am: c3bce764fc
...
Original change: undetermined
Change-Id: Ibfdcf90684654ef25b51176bce5d872bc08c84c4
2020-06-02 15:13:59 +00:00
Bonian Chen
b399a6394f
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 68b19028ee
...
Original change: undetermined
Change-Id: I543700ac47c922505c0d00e1c97d398115b4f942
2020-06-02 15:12:54 +00:00
Bonian Chen
047f010b63
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf am: 8dfb423714
...
Original change: undetermined
Change-Id: I86c72b738cefe7d523b3fad63ce8d03aecbacba7
2020-06-02 15:12:32 +00:00
Bonian Chen
c3bce764fc
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 4191af1eb1
...
Original change: undetermined
Change-Id: I6204013f38271d3f53aca613670672d7d8957ca2
2020-06-02 14:58:48 +00:00
Bonian Chen
68b19028ee
Merge "[Settings] Move mobile data template out of framework" into rvc-dev am: 68cc44bb77 am: 45382e75cf
...
Original change: undetermined
Change-Id: I7e136e9e2cc2e4ef76ec5fd9d31af7465659824e
2020-06-02 14:58:19 +00:00
