Joshua Duong
04bc02223e
Merge changes from topic "adbwifi-bugs"
...
* changes:
Add toast error message for no WiFi on wireless debugging.
Add visibility control to ADB QR code preference.
2020-03-20 15:07:14 +00:00
Joshua Duong
564f6ba770
Add toast error message for no WiFi on wireless debugging.
...
Show a toast to connect to a WiFi network when the user tries to
enable wireless debugging while not connected to any Wi-Fi network.
Bug: 150139061
Bug: 149843499
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest
Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5
Exempt-From-Owner-Approval: LGTM
2020-03-20 15:05:28 +00:00
Menghan Li
99a3ae966a
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 7901e49ef2 am: 258eb64659 am: a54d1632b9
...
Change-Id: Icf671c522263883619c020bfc74e1da84b7d5380
2020-03-20 13:32:56 +00:00
Menghan Li
0f094d9d2d
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 9abfb90214 am: 296e0d540c am: 567ea6362e
...
Change-Id: I33fb7100974ac8015180aa2a30cfcdd324de2da5
2020-03-20 13:32:49 +00:00
Menghan Li
a54d1632b9
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 7901e49ef2 am: 258eb64659
...
Change-Id: I6b9c7e564837fee61b19e1454c086679a9437b7b
2020-03-20 13:32:49 +00:00
Menghan Li
3584ad62e5
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 4199c44cb0 am: 7462ad2d4c
...
Change-Id: I92d01c4aa0ea94287d8576be47b8086bfbb06cff
2020-03-20 13:32:38 +00:00
Menghan Li
567ea6362e
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 9abfb90214 am: 296e0d540c
...
Change-Id: Ib92fcab1692e7dfdaf26cd8e74eeec62bbe6db05
2020-03-20 13:22:26 +00:00
Menghan Li
7462ad2d4c
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 4199c44cb0
...
Change-Id: I5b865b8e606330100e0d2e9799ba30aab42cd1ff
2020-03-20 13:22:19 +00:00
Menghan Li
258eb64659
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 7901e49ef2
...
Change-Id: I6920b26b9b1093561a761c01b84c13bb37f5a00c
2020-03-20 13:22:18 +00:00
Menghan Li
296e0d540c
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 9abfb90214
...
Change-Id: Ie3c3ab884e0fc9faed6627e19bc5beece208ae6c
2020-03-20 13:06:17 +00:00
Menghan Li
7901e49ef2
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd
...
Change-Id: I8615cd4c88929e4dd0fde9bfc12085cf2d90a989
2020-03-20 13:06:16 +00:00
Menghan Li
4199c44cb0
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd
...
Change-Id: Ib5dcdc90d930e27cecb554f12167999f997f0f8b
2020-03-20 13:05:57 +00:00
Menghan Li
9abfb90214
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019
...
Change-Id: Ib0e2b619702d3a5b1ee6ef9e5938066a672586d0
2020-03-20 12:53:38 +00:00
Menghan Li
135bab49bd
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019
...
Change-Id: I6184173dd956c7fd2eb3f0fe57a5aef6b14cf4c3
2020-03-20 12:53:19 +00:00
TreeHugger Robot
20c6af23d7
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: f72de7d1c0 am: 1572476ba9 am: 9e21098fc1
...
Change-Id: If739ca291332d71f103069f080931227706fe871
2020-03-20 12:41:12 +00:00
TreeHugger Robot
5ffd8fed9b
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 1b626efa74 am: 67d2c67330 am: 156250fd64
...
Change-Id: I15528d868f21f0fe674a67fe359bbf034361c402
2020-03-20 12:41:07 +00:00
TreeHugger Robot
52257685e8
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: a0783d38b2 am: f4e9e0394b
...
Change-Id: I8af6876ca8dd052ac4dd74cc20faa725b33e925d
2020-03-20 12:40:59 +00:00
Menghan Li
9eb0906019
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev
2020-03-20 12:36:29 +00:00
TreeHugger Robot
9e21098fc1
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: f72de7d1c0 am: 1572476ba9
...
Change-Id: I36390c8a821ea14d122bb9029c7fb2c63e7d37cb
2020-03-20 12:33:57 +00:00
TreeHugger Robot
156250fd64
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 1b626efa74 am: 67d2c67330
...
Change-Id: If5828cc39d2ccd9df9fb19964e4f554f4d90e44e
2020-03-20 12:22:35 +00:00
TreeHugger Robot
f4e9e0394b
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: a0783d38b2
...
Change-Id: Ie8b7722d5d5eaf852a35cee9c8feaeb713b62894
2020-03-20 12:22:29 +00:00
TreeHugger Robot
1572476ba9
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: f72de7d1c0
...
Change-Id: I27a61ede192718593dce3c4fa933fa968e48a510
2020-03-20 12:22:20 +00:00
TreeHugger Robot
67d2c67330
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 1b626efa74
...
Change-Id: I6d001a98a776d2ee0091d73f3f04db0628773fd2
2020-03-20 12:06:23 +00:00
TreeHugger Robot
f72de7d1c0
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef
...
Change-Id: I1c44a3faeab8b568b7b392df8d490698e963fda3
2020-03-20 12:06:16 +00:00
TreeHugger Robot
a0783d38b2
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef
...
Change-Id: I1160c7f6cac33a60b626a77c067403a000612687
2020-03-20 12:06:00 +00:00
Junyu Lai
daeafbcb65
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 am: fbda2bf9fe am: 8e6aaf60bc am: 36f05339f6
...
Change-Id: Id159a2f174db5ad56be775cbf533c91b8eef8679
2020-03-20 11:52:54 +00:00
Bonian Chen
339e5b0eee
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a am: d03f6a14d7 am: f528f54591
...
Change-Id: I72e070350e1b0ceccb5f36178c83ac529fd4251b
2020-03-20 11:52:35 +00:00
Bonian Chen
51524ab8d5
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: b6ff3cf826 am: 6677d2b6b1 am: daae7ecee6
...
Change-Id: Id6ca9dc7c8f4efa29f2431c1c486055fba285d1e
2020-03-20 11:51:46 +00:00
Junyu Lai
f7f9b5e663
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 2f60c6dddd am: 6cc97dc6aa am: 716d91c254
...
Change-Id: Ic84ce14cff6793b410b715a1f269f7de023b9ef5
2020-03-20 11:50:32 +00:00
Automerger Merge Worker
86b026be4e
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp am: d7a9941088 am: 00a8e4dc70
...
Change-Id: Ia358b090bf49654d56ea5c9232737e1902326b32
2020-03-20 11:50:19 +00:00
Junyu Lai
36f05339f6
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 am: fbda2bf9fe am: 8e6aaf60bc
...
Change-Id: Ia244c2bf9f771e4b02e60cdfc3d90fda9dd0ce22
2020-03-20 11:49:46 +00:00
Automerger Merge Worker
6fad8f62f6
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d am: 106cf460f0
...
Change-Id: I9518bc4eb9dc23aa34eae082e5426cae6a6ca4e3
2020-03-20 11:49:39 +00:00
Bonian Chen
f528f54591
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a am: d03f6a14d7
...
Change-Id: Ic6303af218eeb87bfa8f26d469464ccf71c2d22a
2020-03-20 11:49:33 +00:00
Bonian Chen
4400503dd8
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4 am: 6a6d143ad2 am: 3d1b805340
...
Change-Id: Ia7dffb5cbab72a827067c9673a8fadc85ac8cb64
2020-03-20 11:49:26 +00:00
Bonian Chen
e2e597c538
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b am: 5ec5ac505a
...
Change-Id: I95b460761888220716bd2000976a01bc3ef92524
2020-03-20 11:49:11 +00:00
Bonian Chen
daae7ecee6
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: b6ff3cf826 am: 6677d2b6b1
...
Change-Id: I30786ba35d6795ea190cfab54baf70ef63d1c7ed
2020-03-20 11:48:53 +00:00
Bonian Chen
d874f73d40
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a am: 2f5b6f5350
...
Change-Id: I73692312ef9e266cddac3e6581798bfaeb23793c
2020-03-20 11:48:42 +00:00
TreeHugger Robot
1b626efa74
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb
...
Change-Id: Iffd12985a04ff5d2b958c258bfee5eccc0561b56
2020-03-20 11:44:18 +00:00
TreeHugger Robot
3a9efed4ef
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb
...
Change-Id: I1eb8c117d3226c25d50f33100ec434f38923aec5
2020-03-20 11:43:57 +00:00
Junyu Lai
8e6aaf60bc
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 am: fbda2bf9fe
...
Change-Id: Iee4217dd836b1201470b5dd384abd34b64a80f0b
2020-03-20 11:37:01 +00:00
Bonian Chen
d03f6a14d7
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a
...
Change-Id: Iff9b950c50d9c2e384805a3fa3f83b4426c1b45d
2020-03-20 11:36:51 +00:00
Bonian Chen
6677d2b6b1
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: b6ff3cf826
...
Change-Id: I3eb8e8f8467ba673c2246f5277583e8094187a02
2020-03-20 11:36:34 +00:00
Junyu Lai
716d91c254
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 2f60c6dddd am: 6cc97dc6aa
...
Change-Id: Ib8fe2feac663d94e9c29780cebe8d9588e60b4d3
2020-03-20 11:31:00 +00:00
Automerger Merge Worker
00a8e4dc70
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp am: d7a9941088
...
Change-Id: I280f3d9af2c3ecd8e630d87aad59a95622470f80
2020-03-20 11:30:50 +00:00
Automerger Merge Worker
106cf460f0
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d
...
Change-Id: I69ad6ab73bce7f5d39d6e34f8c489ab0a6a7bcbd
2020-03-20 11:30:36 +00:00
Bonian Chen
3d1b805340
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4 am: 6a6d143ad2
...
Change-Id: I38511a9a62ad29f73500b163748e67722910fa85
2020-03-20 11:30:23 +00:00
Bonian Chen
5ec5ac505a
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b
...
Change-Id: I52349d357ee81fd902adc80515e0b7f6197aa9f2
2020-03-20 11:30:14 +00:00
Bonian Chen
2f5b6f5350
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a
...
Change-Id: I4fcfd9ae20ea503e62c1042e8227e065a44b4713
2020-03-20 11:30:08 +00:00
TreeHugger Robot
a5a629c7fb
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev
2020-03-20 11:28:18 +00:00
Junyu Lai
6cc97dc6aa
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 2f60c6dddd
...
Change-Id: Ifa142647b5c0371256dcc4b616ba44b31df2b624
2020-03-20 11:15:57 +00:00
