Commit Graph

65673 Commits

Author SHA1 Message Date
The Android Open Source Project
24cabff9dd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I77ea27e55c35b45123c1ee7cae67b09cc3e4218f
2020-08-06 18:23:50 -07: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
0f68ecf2ee [Settings] Remove Phone hidden constants access
Remove access to:
1. Phone.CDMA_SUBSCRIPTION_UNKNOWN
2. Phone.PREFERRED_NT_MODE
3. Phone.PREFERRED_CDMA_SUBSCRIPTION

Bug: 147794713
Test: manual
Merged-In: I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38
Change-Id: I438afb81ccad20971a15eb1fe0af7d37202c6a88
2020-08-06 23:58:24 +08:00
Bonian Chen
f84f6e49ee [Settings] Code refactor
Minor code refactor

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Merged-In: I060e7c880d91a0e5059610c5ceae319d47c19c7a
Change-Id: I378b3c7ad5531efd5f2dad4bdafbcddacaf66db4
2020-08-06 23:24:29 +08: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
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
Bonian Chen
35f53d7fbd Merge "[Settings] Sync summary of call preference with dialer" 2020-08-06 06:05:17 +00:00
Bonian Chen
fc47bff681 Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160

Change-Id: I69cb17780ba0a519420557977398c2f86cda1118
2020-08-06 04:41:30 +00:00
Bonian Chen
96533385f0 Merge "[Settings] Access ProxySubscriptionManager within DataUsage" 2020-08-06 04:21:45 +00:00
Bonian Chen
44fbf04469 Merge "Remove useless png and add vector drawable" am: 0cfec664c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546

Change-Id: I6875e7a5e7b41b178f54999b49b346f62d4bcb6a
2020-08-06 03:32:18 +00:00
Bonian Chen
0a1d15530b Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: Ibcaea10f983975809aa97635239f3b6850a22e9c
2020-08-06 03:32:07 +00:00
Bonian Chen
0cfec664c4 Merge "Remove useless png and add vector drawable" 2020-08-06 03:11:56 +00:00
Bonian Chen
75b3666b02 Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" 2020-08-06 03:11:21 +00:00
changbetty
f1a52da792 [Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest

Merged-In: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
Change-Id: Idca7a76c591448a45ecc33cb392f416c70d32f91
2020-08-06 09:14:58 +08:00
Raff Tsai
cbd234e1c1 Remove useless png and add vector drawable
Bug: 139336138
Test: visual
Merged-In: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
Change-Id: If7de9126c8afab3422999db66ad9b7a179334f10
2020-08-06 09:03:32 +08:00
Bonian Chen
f42a022a8f Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157

Change-Id: I051cd4ac15732c3fa4e5b93ee2af768fcfd21956
2020-08-05 23:03:03 +00:00
Bonian Chen
e24a23f9ab Merge "Look up CBS package name through PackageManager." 2020-08-05 22:44:23 +00:00
Xin Li
dcaeff56e3 Merge "Merge QQ3A.200805.001" am: cded32987b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I36aaf8b9f26c71377d1c6c64396e2eb5cb2114bb
2020-08-05 21:19:11 +00:00
Xin Li
cded32987b Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
TreeHugger Robot
66de015218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12315580

Change-Id: I955b425cf9235fe2e41e036109cd7ccfe8648ac3
2020-08-05 16:21:25 +00:00
TreeHugger Robot
03521b9303 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-05 16:10:14 +00:00
Bonian Chen
12c22d8066 [Settings] Access ProxySubscriptionManager within DataUsage
Redirect some SubscriptionManager access to ProxySubscriptionManager.
This will reduce some access latency.

Bug: 141833767
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Merged-In: I2cb30dd0570a09543a13ca01cf054ba2d18d70d4
Change-Id: I536b45fd5ddd5d9d9591a133a0f79227a670d7dd
2020-08-05 23:04:45 +08:00
Bill Yi
a11a26cdbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I54e58debc730f1459809075a2c0cabc411ebce6e
2020-08-05 14:33:42 +00:00
Bonian Chen
95d85a0742 [Settings] Avoid from EUICC access blocking main thread
Avoid from EUICC accessing form main thread and timeout if API takes too
much time.

Bug: 143996139
Test: manual
Merged-In: Ic1a2bd948b69d40632555d293df6ed56a6b7a712
Change-Id: Ia2a15ee43ce2b49b90c8d0626aee939c536aea56
2020-08-05 22:17:50 +08:00
Amit Mahajan
42d1d4be6b Look up CBS package name through PackageManager.
Instead of hardcoding it.

Test: manual
Bug: 154436403
Merged-In: I0feb356e6cd4868f71198bdee49a7658b4b98b5d
Change-Id: I9b3b3464614eac7394434e55eb142bc1053e8758
2020-08-05 21:58:45 +08:00
Bonian Chen
defa3f47b5 [Settings] Sync summary of call preference with dialer
Replacing the display of summary part within Settings' calls preference
by VoIP account when configured calling account settings within Dialer.

The click behavior for calls preference remain unchanged, due to this is
the configuration for subscription (instead of for all kinds of
accounts).

Bug: 136277187
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Merged-In: Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8
Change-Id: I6f2f44d305119f09e2188de702f14f2506a4903c
2020-08-05 18:17:04 +08:00
Bonian Chen
e1d58f6977 [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours am: 009f7ec40d -s ours
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058

Change-Id: I974456eb70254ce7289056b21e361004d9e753f0
2020-08-05 09:57:29 +00:00
Bonian Chen
5c1fbcc7d1 [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128

Change-Id: Ia80619e1f81201331d7168cb2c0ceb76c10792a6
2020-08-05 09:57:16 +00:00
Bonian Chen
80edde750a [Settings] Enable access from non-UI thread
To support query from settings intelligent, these listeners need to
support accessing from non-UI thread.

Bug: 149543756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Merged-In: I768f41f76d0223634be2b728d33fa0cfcc69fe69
Change-Id: I5d076d95410a2d904f8ebb1d82df90dd6aa52099
2020-08-05 17:55:12 +08:00
Bonian Chen
009f7ec40d [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058

Change-Id: I7b4659c785548541a4062c4336b31b7e6b8e3ed3
2020-08-05 09:38:25 +00:00