Tsung-Mao Fang
d042a9f2d3
The text on toast should be changed when remains 1 time for SIM lock input
...
The behavior of getQuantityString() is different according to language, it gets both "other" and "one" string if English is system language. But it always gets "other" string if non-English, then the "other" string of wrong_pin_code is shown even if remains 1 time of SIM lock input.
In order to change the string in any language, we add new string for remains 1 time.
Test: Rebuild rom
Fix: 71783850
Merged-In: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
Change-Id: I1c069333b19399b727e10ed4a6c9483cc1bc44a6
2020-08-07 06:19:07 +00:00
calvinpan
20d2826381
Add NR Global to the logic to check if it is Global
...
Bug: 151285260
Test: Build pass
Merged-In: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
Change-Id: I5b0414302c9214116de30212a03a36972af29ca1
2020-08-07 13:11:02 +08:00
SongFerngWang
9bcf7861bd
Remove the second network scan.
...
Fix: 153427564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkSelectSettingsTest
(PASS)
Merged-In: If593fc4a4dd463bbc178b4864ad0ba01bb421b09
Change-Id: I34b898514351aa6c00934ce638e3a59a5aa8f077
2020-08-07 13:02:45 +08:00
Bonian Chen
5bf89f4f5a
Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393243
Change-Id: I4103dbdd33177ecd4e91687abd6a0fc271313155
2020-08-07 04:26:36 +00:00
Bonian Chen
43a78331d5
Merge "[Settings] Code refactor" am: 2410478bee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393240
Change-Id: I6251d8ae967e6a29d5d85f6dfe62cd6316925ca2
2020-08-07 04:26:19 +00:00
Bonian Chen
c78b12f3f4
Merge "[Settings] Remove Phone hidden constants access"
2020-08-07 04:12:03 +00:00
Bonian Chen
2410478bee
Merge "[Settings] Code refactor"
2020-08-07 04:11:29 +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
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
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
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
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
f257197d96
Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I7754cefefd1224608fe879c36e00307d6777bc79
2020-08-05 09:20:21 +00:00
Bonian Chen
d03c8bfb1c
Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128
Change-Id: I3d4187956b376cf2a8138df5cdad4263c6b7b31c
2020-08-05 09:20:10 +00:00
Bonian Chen
3e545f2bef
Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings"
2020-08-05 09:16:55 +00:00
Bonian Chen
d3c8a4c3ee
Merge "Mainline remove hide api SubscriptionInfo.getCardString"
2020-08-05 09:03:44 +00:00
Bonian Chen
0f951e1b90
Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134
Change-Id: I8161ffae6bbe96c93dafa3328cb2fdad6614b4d9
2020-08-05 07:12:12 +00:00
changbetty
310eeebe5c
[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings
...
Bug: 147206736
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionUtilTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataSliceTest
Merged-In: I6d7e72a656723c0620d579e1e223945e2a3588af
Change-Id: I99b63b33395641ecd0b00997fa3792bbd59efeda
2020-08-05 15:08:59 +08:00
SongFerngWang
888e9cbdf9
Mainline remove hide api SubscriptionInfo.getCardString
...
Bug: 147128878
Test: build pass
Merged-In: Idb44af6a01626013339f5ca05486dd11112a5867
Change-Id: Ib222c08bc4baa3fdcaea1fa2020d7de6d6a4fcec
2020-08-05 07:07:11 +00:00
Bonian Chen
6afb84d6b2
Merge "Mainline: removed legacy UI for network selection mode."
2020-08-05 06:56:38 +00:00
Bonian Chen
05b07f424e
Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387127
Change-Id: I9e2af4dda890ab5b13aa049430161eab1d602df3
2020-08-05 06:11:11 +00:00
Bonian Chen
1e328285b7
Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126
Change-Id: I9389e2226554123fd25844c27aa24e6b13466124
2020-08-05 06:11:00 +00:00
Bonian Chen
622da45ee6
Merge "[Settings] Data roaming warning only when turn ON"
2020-08-05 05:58:13 +00:00
Bonian Chen
b3b25c39c9
Merge "Removed reference to PhoneConstant PHONE_TYPE_*"
2020-08-05 05:55:32 +00:00
SongFerngWang
7e045ab9f6
Mainline: removed legacy UI for network selection mode.
...
This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: build pass
Merged-In: I1a0f431f05268d29afce145c3eb720594cfc57a3
Change-Id: I54ed8c69edcdc618f8cf8df8af0fffc8c4f187e8
2020-08-05 12:58:53 +08:00
Bonian Chen
f5557102c9
Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129
Change-Id: I84e8bf96b0d58f5833e00effaee52e120f77fa98
2020-08-05 04:57:19 +00:00
Bonian Chen
144e2b41f5
Merge "Remove logic to manually search inactive pSIM."
2020-08-05 04:39:45 +00:00
Xin Li
d2b2a4e126
Merge QQ3A.200805.001
...
Bug: 162879794
Merged-In: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
Change-Id: I1129dba865eb6acaa047bc43e3057d02d8528ff0
2020-08-04 15:30:39 -07:00
Malcolm Chen
3805373f90
Remove logic to manually search inactive pSIM.
...
Nowe inserted inactive pSIM will be included in Telephony's get
available and get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: unittest
Merged-In: Icd131f133e47dae0770a4da71c51de3c2a94b42b
Change-Id: I9ba5dded7817116c02d70298c9c271ff6a99925b
2020-08-04 18:57:37 +08:00
Bonian Chen
603dcc1856
Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124
Change-Id: Id886131d82e274572e4277ed8d8f0f61513a8d65
2020-08-04 10:41:58 +00:00