The Android Open Source Project
7b6716fca6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6ae316705dbbaeae8fdc65d64073c19a07fbd04
2020-08-07 01:47:32 -07:00
Bonian Chen
d8c7d06d1d
[automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
am: 7b7b900fa3
-s ours am: 5b01d70d8c
-s ours am: cf10e35ea5
-s ours am: 3df18c4d1f
-s ours
...
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: I073a9f6736824b5718ee3f137e9317cc412cdc64
2020-08-06 17:13:23 +00:00
Bonian Chen
926f22b882
[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
am: 28e5351779
-s ours am: b0e6b28c4b
-s ours am: b770db49d9
-s ours am: 52e2324b61
-s ours
...
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: I3f9e8d160f0ba493dd453a590cabb3b7e21ccbed
2020-08-06 17:12:35 +00:00
Bonian Chen
4e6f391b77
[automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
am: 4b755362e6
-s ours am: cce627f7a7
-s ours am: 09071f7a2d
-s ours am: 3e26a1e58d
-s ours
...
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: Ib719a98b255d06fe574106d9acee8997859106fb
2020-08-06 17:12:05 +00:00
Bonian Chen
28899c9fa2
[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0
am: fc47bff681
-s ours am: 5b79ed5ffa
-s ours am: 309cd83703
-s ours am: e501cd2a91
-s ours
...
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160
Change-Id: I9ad2450b0125555601c06994cdb8ea2f5ce8a7b2
2020-08-06 17:11:56 +00:00
Bonian Chen
a61d07c2f4
[automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4
am: 44fbf04469
-s ours am: 45bd473128
-s ours am: db44ed63d8
-s ours am: fb8293a152
-s ours
...
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546
Change-Id: I4fbf8de036f37012b9a8860e403d657d6e0d99ce
2020-08-06 17:11:46 +00:00
Bonian Chen
49a060496f
[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
am: 0a1d15530b
-s ours am: f9803fc6c2
-s ours am: 4486da9ea9
-s ours am: b77aaf8055
-s ours
...
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547
Change-Id: I0bf95079d8eb2a73c616c8647c02e2a04a68ae7e
2020-08-06 17:10:14 +00:00
Bonian Chen
28b81ab03d
[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
am: f42a022a8f
-s ours am: e60cb2f67b
-s ours am: 339c352ac3
-s ours am: 8f8468fd08
-s ours
...
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: Ibf47cd2ab147b636015b3d22912bfc74b5d41fca
2020-08-06 17:09:30 +00:00
Xin Li
2412da9a44
Merge "Merge QQ3A.200805.001" am: cded32987b
am: dcaeff56e3
am: 761d56988b
am: c9e538e9da
am: ff75eec671
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671
Change-Id: Ice1f181ad4d9b7a5ff5c8a1359fe9acfc1f5bb95
2020-08-06 17:06:29 +00:00
Bonian Chen
3df18c4d1f
[automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
am: 7b7b900fa3
-s ours am: 5b01d70d8c
-s ours am: cf10e35ea5
-s ours
...
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: Id389b1e3c4d968b10bf903617f337cc8286234a0
2020-08-06 16:55:07 +00:00
Bonian Chen
52e2324b61
[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
am: 28e5351779
-s ours am: b0e6b28c4b
-s ours am: b770db49d9
-s ours
...
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: Ib9a383b64c4f02ab103aa246f655fc9f7499319f
2020-08-06 16:54:51 +00:00
Bonian Chen
3e26a1e58d
[automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
am: 4b755362e6
-s ours am: cce627f7a7
-s ours am: 09071f7a2d
-s ours
...
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: Ib42ae53c6b7781be764cec229b2bee6b175a1f2a
2020-08-06 16:54:44 +00:00
Bonian Chen
e501cd2a91
[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0
am: fc47bff681
-s ours am: 5b79ed5ffa
-s ours am: 309cd83703
-s ours
...
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160
Change-Id: Iba75d964901531cb32ac386064be3a59af81ae7b
2020-08-06 16:54:36 +00:00
Bonian Chen
fb8293a152
[automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4
am: 44fbf04469
-s ours am: 45bd473128
-s ours am: db44ed63d8
-s ours
...
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546
Change-Id: I25ab1624f08db239b6d0783aa580722a649804db
2020-08-06 16:54:14 +00:00
Bonian Chen
b77aaf8055
[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
am: 0a1d15530b
-s ours am: f9803fc6c2
-s ours am: 4486da9ea9
-s ours
...
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547
Change-Id: Iee0800365e6a9ca0ca27b0482baa5d8d220ca46c
2020-08-06 16:53:03 +00:00
Bonian Chen
8f8468fd08
[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
am: f42a022a8f
-s ours am: e60cb2f67b
-s ours am: 339c352ac3
-s ours
...
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: Iaef18fc04be9b7d94cb84655dca15d9479778f1d
2020-08-06 16:51:16 +00:00
Xin Li
ff75eec671
Merge "Merge QQ3A.200805.001" am: cded32987b
am: dcaeff56e3
am: 761d56988b
am: c9e538e9da
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671
Change-Id: I71a23041e53c6f666bcba7360f07917fdbcab96b
2020-08-06 16:48:26 +00:00
Bonian Chen
cf10e35ea5
[automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
am: 7b7b900fa3
-s ours am: 5b01d70d8c
-s ours
...
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: Ibc36bfff1566749ec274e2a7cf3d8bdca8e39d2a
2020-08-06 16:36:31 +00:00
Bonian Chen
b770db49d9
[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
am: 28e5351779
-s ours am: b0e6b28c4b
-s ours
...
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: I9459c3e557266dc6fb3730571e09d42390283aab
2020-08-06 16:36:22 +00:00
Bonian Chen
09071f7a2d
[automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
am: 4b755362e6
-s ours am: cce627f7a7
-s ours
...
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: I90c98f6131f2f5f597c1982a30f10f1c7b4b7f26
2020-08-06 16:36:12 +00:00
Bonian Chen
309cd83703
[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0
am: fc47bff681
-s ours am: 5b79ed5ffa
-s ours
...
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160
Change-Id: I5785c59cc57f97c35202c642716be82e9c375f47
2020-08-06 16:36:04 +00:00
Bonian Chen
db44ed63d8
[automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4
am: 44fbf04469
-s ours am: 45bd473128
-s ours
...
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546
Change-Id: I872d489107430b37a8123482a1a12474cb5226ce
2020-08-06 16:35:47 +00:00
Bonian Chen
4486da9ea9
[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
am: 0a1d15530b
-s ours am: f9803fc6c2
-s ours
...
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547
Change-Id: I5fd41f91894c3596eb24935b9ddc17dac3d4ddf5
2020-08-06 16:35:39 +00:00
Bonian Chen
339c352ac3
[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
am: f42a022a8f
-s ours am: e60cb2f67b
-s ours
...
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: Ibf4937b0c5da38d7102def87014b475e01b6cc55
2020-08-06 16:35:21 +00:00
Xin Li
c9e538e9da
Merge "Merge QQ3A.200805.001" am: cded32987b
am: dcaeff56e3
am: 761d56988b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671
Change-Id: Idcf8e17d4ace8b00c4a8c76c25e25840ae880874
2020-08-06 16:22:27 +00:00
Bonian Chen
5b01d70d8c
[automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
am: 7b7b900fa3
-s ours
...
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: I00d35bda613fcba39b0cd5356cc1bb488d118f2f
2020-08-06 16:06:57 +00:00
Bonian Chen
b0e6b28c4b
[automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
am: 28e5351779
-s ours
...
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: I3aed4bd7866c29d049a454fa3bc22511cc3aad6c
2020-08-06 16:06:50 +00:00
Bonian Chen
cce627f7a7
[automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
am: 4b755362e6
-s ours
...
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: Icb6307eb82260d281a381975eff6607505ba5455
2020-08-06 16:06:43 +00:00
Bonian Chen
5b79ed5ffa
[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0
am: fc47bff681
-s ours
...
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160
Change-Id: I57ea4371d2effc3fd4a1ee9faac999014696599c
2020-08-06 16:06:35 +00:00
Bonian Chen
45bd473128
[automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4
am: 44fbf04469
-s ours
...
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546
Change-Id: Id49648216c4f5d251c3fe1d817904d66aca04237
2020-08-06 16:05:56 +00:00
Bonian Chen
f9803fc6c2
[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
am: 0a1d15530b
-s ours
...
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547
Change-Id: I2c9008cb50c9de6a36eefa1aa2a20268696628ce
2020-08-06 16:05:36 +00:00
Bonian Chen
e60cb2f67b
[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
am: f42a022a8f
-s ours
...
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: Ibb8c7d6fa353f6e6036ed355a9a24490b181cb5d
2020-08-06 16:03:52 +00:00
Xin Li
761d56988b
Merge "Merge QQ3A.200805.001" am: cded32987b
am: dcaeff56e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671
Change-Id: I185588633bf511b2389c2f69cf35717ae6d746a6
2020-08-06 16:02:18 +00:00
Bonian Chen
1d3b592e56
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: ce917cbad0
am: 94bce5c6dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: Ie05fbaae507e038427d941dd7c7f79e229227315
2020-08-06 11:56:36 +00:00
Bonian Chen
0c67aefa72
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: 64e70d916d
am: 9b08bbac0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: Ieccbdaea6b61b1725a41c7defba3be9a32ab173b
2020-08-06 11:56:27 +00:00
Bonian Chen
94bce5c6dd
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: ce917cbad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: I9aa360b4545d71bc8149a6b1ef271123ff0843b9
2020-08-06 11:40:33 +00:00
Bonian Chen
9b08bbac0f
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: 64e70d916d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: I7fe5607853940a426e05061e3b1ced7a55f389b6
2020-08-06 11:39:23 +00:00
Bonian Chen
ce917cbad0
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: I8a3f2baa2d505eaf3e61ad1a5e4022d3b70e0638
2020-08-06 11:23:11 +00:00
Bonian Chen
64e70d916d
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: Ia8c30b0ff0fcbe4720264105edf8c7ad16353b5a
2020-08-06 11:21:50 +00:00
Bonian Chen
65575cfb66
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev
2020-08-06 11:04:29 +00:00
TreeHugger Robot
3d2f50d842
Merge "[Wi-Fi] Fix thread leak in WifiConnectionPreferenceController"
2020-08-06 08:03:00 +00:00
tim peng
eaf49d181c
Merge "Show all devices, including connected ones, into "Previously connected" page"
2020-08-06 07:07:31 +00:00
Arc Wang
3157be53fc
[Wi-Fi] Fix thread leak in WifiConnectionPreferenceController
...
Stop the worker thread for WifiPickerTracker at onDestroy
event. The event will be triggered when users click back button
at 'Network & internet' page.
Bug: 161659380
Test: manual
1. Launch Settings 'Network & internet'.
2. Use below command to observe the thread.
ps -T SettingsProcessId | grep WifiConnPrefCtr
3. Click back button and use the command again,
the thread should not exist.
Change-Id: I9145d534ade168beca52524e7cf85d87e2feb1a0
2020-08-06 14:47:43 +08:00
Edgar Wang
dea18dff70
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-06 06:31:49 +00:00
Betty Chang
ed0e76d073
Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest"
2020-08-06 06:29:23 +00:00
Bonian Chen
7b7b900fa3
Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: Id5642816c285ca5fe0f0ea13d9e159bdacdcfd4f
2020-08-06 06:22:31 +00:00
Bonian Chen
28e5351779
Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: I0c69063cb7e4e0e689c00cfeeea56d63fc878568
2020-08-06 06:22:21 +00:00
Bonian Chen
4b755362e6
Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: I03e90f8a04f7f50b5314e51e097b1388166e0f37
2020-08-06 06:22:09 +00:00
Bonian Chen
bb750ad2d7
Merge "[Settings] Avoid from EUICC access blocking main thread"
2020-08-06 06:05:35 +00:00
Bonian Chen
9ec200f85c
Merge "[Settings] Enable access from non-UI thread"
2020-08-06 06:05:29 +00:00