Commit Graph

63458 Commits

Author SHA1 Message Date
Menghan Li
54609663de Merge "Revise Q behavior migration of accessibility edit dialog" into rvc-dev am: 6c59995503
Change-Id: Ieb416e79e10a9f5a885c061f46f9b2c55f2a1356
2020-04-07 06:02:15 +00:00
Menghan Li
90c5d2e67c Merge "Revise Q behavior migration of accessibility edit dialog" into rvc-dev am: 6c59995503
Change-Id: Ie0a5cbcae2e3913dc293d4714070d958a1ee2344
2020-04-07 06:02:06 +00:00
Bonian Chen
1e5cf6525a Merge "[Settings] Core refactor" into rvc-dev 2020-04-07 05:57:28 +00:00
Menghan Li
6c59995503 Merge "Revise Q behavior migration of accessibility edit dialog" into rvc-dev 2020-04-07 05:54:56 +00:00
Treehugger Robot
d98580b484 Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580 am: f1f6f6f366 am: e742075afe am: 7ad3c5a1c5
Change-Id: I47d716cef96d42f04556431989b90a4126ec1229
2020-04-07 05:35:33 +00:00
Bonian Chen
9469f65c2c [automerger skipped] Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26f4 am: 3b7041d9f3 -s ours am: fc9209c3f6 -s ours am: 7c83bded27 -s ours
am skip reason: Change-Id I391b034c9badd43094ab52b8b6488bca07ef3c86 with SHA-1 594c267e99 is in history

Change-Id: I143481a2006c580085f62d603f6e4b27f0cace6d
2020-04-07 05:30:20 +00:00
Menghan Li
b50db265f1 [automerger skipped] Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 57f7168c9e am: ca01f2bd30 am: 783598ce7c -s ours
am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 aa87e024d5 is in history

Change-Id: Ia746e13cef0fce002901dc0f1fc6cdccb8e555aa
2020-04-07 05:23:28 +00:00
Menghan Li
d0fbfa7a65 [automerger skipped] Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 0f576c7727 am: fb9ce11def am: 10b70fb05e -s ours
am skip reason: Change-Id I714db2a450e34d33e5728cf355136d26bef77e11 with SHA-1 9e1bb0def1 is in history

Change-Id: I8be5a8cdd40b89db3776e5afcc64e12bfe49757e
2020-04-07 05:23:03 +00:00
Treehugger Robot
7ad3c5a1c5 Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580 am: f1f6f6f366 am: e742075afe
Change-Id: I25ea2de65300bebe753233287423bee5da156e6d
2020-04-07 05:14:59 +00:00
Bonian Chen
7c83bded27 [automerger skipped] Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26f4 am: 3b7041d9f3 -s ours am: fc9209c3f6 -s ours
am skip reason: Change-Id I391b034c9badd43094ab52b8b6488bca07ef3c86 with SHA-1 594c267e99 is in history

Change-Id: I9931c5d023a827c03c9555cad473a96afafa1e4b
2020-04-07 05:14:52 +00:00
Menghan Li
4332a479d4 [automerger skipped] Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 89456ad125 -s ours am: 3f9a705d22 -s ours
am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 aa87e024d5 is in history

Change-Id: Ic047e9914b137ae3d332424dbbd4fadf9267ea07
2020-04-07 05:06:56 +00:00
Menghan Li
7a77ffa8b3 [automerger skipped] Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 53cd11ffa3 -s ours am: 4d8d18f3f9 -s ours
am skip reason: Change-Id I714db2a450e34d33e5728cf355136d26bef77e11 with SHA-1 9e1bb0def1 is in history

Change-Id: Ib2bc35eb77172bdb0a126f10913d362b77b4e445
2020-04-07 05:06:49 +00:00
Menghan Li
783598ce7c Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 57f7168c9e am: ca01f2bd30
Change-Id: I158fbec994f58d35db5d699a1345e2e64ad37302
2020-04-07 05:06:35 +00:00
Menghan Li
014350daec Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 57f7168c9e am: 017a59b9de
Change-Id: Id37838db384b3ae64d3bd6ca2b27f2d8f146311b
2020-04-07 05:06:30 +00:00
Menghan Li
10b70fb05e Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 0f576c7727 am: fb9ce11def
Change-Id: I2487b4e6059560f2c527746cc10b65effee1dfea
2020-04-07 05:06:27 +00:00
Menghan Li
de8d06821c Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 0f576c7727 am: f9605f039d
Change-Id: If8136753c3343287fbee4c02430586507f5b74af
2020-04-07 05:05:54 +00:00
Treehugger Robot
e742075afe Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580 am: f1f6f6f366
Change-Id: I87c14392ed526238bcb2beecbc56089a9a822c19
2020-04-07 04:58:16 +00:00
Bonian Chen
fc9209c3f6 [automerger skipped] Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26f4 am: 3b7041d9f3 -s ours
am skip reason: Change-Id I391b034c9badd43094ab52b8b6488bca07ef3c86 with SHA-1 594c267e99 is in history

Change-Id: I4824ffcd76833deb054fa8143774b83aa8a46782
2020-04-07 04:58:10 +00:00
Menghan Li
3f9a705d22 [automerger skipped] Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 89456ad125 -s ours
am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 aa87e024d5 is in history

Change-Id: Ifb0454237da0c0f892cc171855a197da7a622624
2020-04-07 04:49:27 +00:00
Menghan Li
4d8d18f3f9 [automerger skipped] Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 53cd11ffa3 -s ours
am skip reason: Change-Id I714db2a450e34d33e5728cf355136d26bef77e11 with SHA-1 9e1bb0def1 is in history

Change-Id: Id6316ec571ba0c9e693ac7ac5bbf232847fa0974
2020-04-07 04:49:18 +00:00
Menghan Li
ca01f2bd30 Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 57f7168c9e
Change-Id: I3ef4eba6b0de48bf1e04aeb9c72373aac23c46b5
2020-04-07 04:49:17 +00:00
Menghan Li
fb9ce11def Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 0f576c7727
Change-Id: I242dabf3e655021278a076ce20d56ea9ebc9a8f8
2020-04-07 04:49:10 +00:00
TreeHugger Robot
fd3fd979f3 Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192 am: cf6c1c9cbb am: d9beeb5b63
Change-Id: I55c3e2be10b2a2bda24ef383be9cf2459d95ade1
2020-04-07 04:49:04 +00:00
Zhen Zhang
68d8dbf761 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18 am: 79ce7a0854 am: 69d49427c9
Change-Id: Id38ef2c675926e9db134a8a38f394460f20f701b
2020-04-07 04:48:57 +00:00
Menghan Li
017a59b9de Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999 am: 57f7168c9e
Change-Id: Ic9c33b9ca56aacd368591585f50b48049633567d
2020-04-07 04:48:35 +00:00
Menghan Li
f9605f039d Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee am: 0f576c7727
Change-Id: Ia63da1dfed23a89868250f5041a3790426b7e51e
2020-04-07 04:48:24 +00:00
Treehugger Robot
f1f6f6f366 Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580
Change-Id: Ia9e9a95554f4e0305ab4f73143574056c048fbb4
2020-04-07 04:40:07 +00:00
Bonian Chen
3b7041d9f3 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26f4
Change-Id: I673a260ee1f1175198090c0ec87e989b34bd3635
2020-04-07 04:39:57 +00:00
Menghan Li
89456ad125 Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999
Change-Id: I98460a11b78bc23f2d98f5f76584d709f3f95503
2020-04-07 04:39:11 +00:00
Menghan Li
57f7168c9e Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999
Change-Id: Ic76b90acb28cf63bcee7ac953a8f14a5f346c20d
2020-04-07 04:39:10 +00:00
Menghan Li
53cd11ffa3 Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
Change-Id: I0112719eb646353187f1ef8a1138cc85e544f261
2020-04-07 04:38:58 +00:00
Menghan Li
0f576c7727 Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
Change-Id: If142e6cf0b0e979a8cca590523071217cffe4532
2020-04-07 04:38:54 +00:00
TreeHugger Robot
8f9c0beb7c Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 3c88fb72ff am: 67289e624a
Change-Id: I5ca1c393ef54d75932a519d215ef912a87d5ba55
2020-04-07 04:29:50 +00:00
Treehugger Robot
4e983425db [automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977 am: 7ca7469230 -s ours am: d8768490af -s ours am: 9f128a011b -s ours
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e is in history

Change-Id: If8fb99ceb32ed8125e3bd61d0ab9f59d37136fa4
2020-04-07 04:29:41 +00:00
Automerger Merge Worker
88171420fe Merge "Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192" into rvc-d1-dev-plus-aosp am: 875b001eb3
Change-Id: I8c766e6a5afe7d957acb1700f20de10e7c1c2594
2020-04-07 04:29:16 +00:00
Zhen Zhang
98f069eea6 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 8e89b0e182 am: 14fa1b7229
Change-Id: Ic89d54efd399ac2dc691240579ebf4f0edff3831
2020-04-07 04:29:03 +00:00
Treehugger Robot
1118235580 Merge "Make URLs in Wi-Fi Calling help description clickable" 2020-04-07 04:28:30 +00:00
Zhen Zhang
77f2676d44 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18 am: 8e541c6272
Change-Id: I5e1cfdba829410149bd828332604155e62379524
2020-04-07 04:28:29 +00:00
TreeHugger Robot
d9beeb5b63 Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192 am: cf6c1c9cbb
Change-Id: I50767c48d386f1c07767be038fafacbdad34494a
2020-04-07 04:28:24 +00:00
Zhen Zhang
69d49427c9 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18 am: 79ce7a0854
Change-Id: I65580dd2e5d4665df0adf63fb1747261e001ffe2
2020-04-07 04:28:06 +00:00
Menghan Li
c0c522d999 Merge "Support caption second UI structure (5/n)" into rvc-dev 2020-04-07 04:24:20 +00:00
Menghan Li
47b01403ee Merge "Support autoclick secondary action (8/n)" into rvc-dev 2020-04-07 04:23:56 +00:00
Bonian Chen
12677c26f4 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" 2020-04-07 04:20:35 +00:00
Bonian Chen
3edefe0fff [Settings] Refactor TelephonyConstants
Refactor TelephonyConstants

Bug: 150352656
Test: make
Change-Id: Ie8ede8ef65e71afbf3435d345751236878493a69
Merged-In: If0552d7ce20de5941667aa64e682202aaf32c597
2020-04-07 04:17:49 +00:00
Bonian Chen
b1c7e21066 [Settings] Core refactor
Remove empty lines, and maintain the comments.

Bug: 150352656
Test: build pass
Change-Id: If0552d7ce20de5941667aa64e682202aaf32c597
2020-04-07 12:09:51 +08:00
TreeHugger Robot
67289e624a Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 3c88fb72ff
Change-Id: I6193d86dcd2ac24845f37f2db9cbc1f1bec42479
2020-04-07 04:09:20 +00:00
Treehugger Robot
9f128a011b [automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977 am: 7ca7469230 -s ours am: d8768490af -s ours
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e is in history

Change-Id: I4540a2b3e17923fc64d16713e047fba5c25fbfb8
2020-04-07 04:09:13 +00:00
TreeHugger Robot
cf6c1c9cbb Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192
Change-Id: I1525a5c686433840a247fde1f7f7e5023716ee4f
2020-04-07 04:08:54 +00:00
Zhen Zhang
79ce7a0854 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18
Change-Id: I2da96861d89773c4a0f4ae0cdac6ddb7d13da855
2020-04-07 04:08:47 +00:00
Automerger Merge Worker
875b001eb3 Merge "Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192" into rvc-d1-dev-plus-aosp 2020-04-07 04:08:41 +00:00