PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,581 Commits 1 Branch 0 Tags
8c8761b74e21c5497ee079004a69b64845ff6db6
Commit Graph

62581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
8c8761b74e [automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 am: 59dfd94170 -s ours 
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d is in history

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

Change-Id: Idf79d9aa5960948943959c262a01d4c3f7d3c97a
 2020-08-12 04:42:00 +00:00
Bonian Chen
59dfd94170 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560

Change-Id: I84b5d35b4a9a0ea77597c45b445768bd2782c845
 2020-08-12 04:24:57 +00:00
Bonian Chen
60d00b58f3 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" 2020-08-12 04:10:10 +00:00
Bonian Chen
17a4871845 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours 
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: Ifda29d94ccdae085264cf14d4b8064db055b4ea2
 2020-08-11 08:37:45 +00:00
Bonian Chen
a9a69c6aa3 Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548

Change-Id: I92dbf184a274d3a22ad597bff0b24d2c44218266
 2020-08-11 08:26:23 +00:00
Bonian Chen
f116c5fae7 Merge "Override 2 getSliceUri() instance to return platform slice" 2020-08-11 08:05:10 +00:00
Fan Zhang
6c046831de Override 2 getSliceUri() instance to return platform slice 
(This is not a clear cherry-pick, @Override need to be removed.)

Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
 2020-08-11 04:24:27 +00:00
Bonian Chen
e8c233c4dc [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours 
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c is in history

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

Change-Id: I15340b9727806d93ad352c154e0b7ed6d16d9def
 2020-08-11 02:58:33 +00:00
Bonian Chen
6cc261d709 Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551

Change-Id: I030d2a19b44d5c5dd91ef07be723f897d0ea057b
 2020-08-11 02:45:31 +00:00
Bonian Chen
5c4154b2e4 Merge "Add interface and extend db to support storing slice uris" 2020-08-11 02:23:56 +00:00
Jiashen Wang
889f702829 Change MobileNetworkUtils to use EuiccManager.isSupportedCountry 
Currently LPA passed supported/unsupported countries to Settings by
writing the value into properties which is not ideal. Instead, we should
call EuiccManager.isSupportedCountry instead.
Bug: 147674689
Test: 1) Manually tested by flashing the change to the device
2) Change LPA to override onGetIsEuiccSupportedCountry
3) Make sure LPA can get the request

Merged-In: Ib136beea325eabdfbd8a6a843611143958dce603
Change-Id: If406d9d803affa334c1ad4f871fcfdc0561c9bf6
 2020-08-10 22:57:02 +08:00
Bonian Chen
528b77a6e3 [automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea am: 8977c4ce49 -s ours 
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85 is in history

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

Change-Id: If755e66d86fb32a43a36c74a2bf37e94694f7fa4
 2020-08-10 11:43:42 +00:00
Bonian Chen
8977c4ce49 Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549

Change-Id: Idb1032b0e1513650da785866e85eef4bff64827f
 2020-08-10 11:21:00 +00:00
Bonian Chen
7e6c957fea Merge "Show/hide 5G preferred network type also consider allowed_network_type" 2020-08-10 11:07:41 +00:00
Bonian Chen
cfe7584cec [automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c am: 80b3bb5141 -s ours 
am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b is in history

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

Change-Id: I012950d0a764a1655ca06e89dd9e98962f386a17
 2020-08-10 10:52:15 +00:00
Bonian Chen
80b3bb5141 Merge "Remove PreferenceCategory wrapper" am: 75124d794c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552

Change-Id: Ia40d77f7daf669323275aab1b05ba81a14c5f499
 2020-08-10 10:31:58 +00:00
Bonian Chen
75124d794c Merge "Remove PreferenceCategory wrapper" 2020-08-10 10:12:14 +00:00
Raff Tsai
91d40cdb21 Remove PreferenceCategory wrapper 
- Avoid similiar issue in b/130396913

Bug: 124129485
Test: manual
Merged-In: I6f4698304210bacba5c76020c375dda49330d2cc
Change-Id: I9d5d856f586ab660a5adb17c0bb1f49e90eca198
 2020-08-10 17:03:13 +08:00
Fan Zhang
f609df425d Add interface and extend db to support storing slice uris 
Bug: 126222433
Test: manual
Merged-In: Ie81e69477d297aa96a0daad02d56196c956271a3
Change-Id: Ifdae6fc47dc078ba83c211d07d6028f00f11e6f2
 2020-08-10 16:50:21 +08:00
Josh Hou
abe032ea66 Show/hide 5G preferred network type also consider allowed_network_type 
1. The carrier or privileged apps will enable/disable network types on
the device, so Settings references the allowed network type to show/hide
5G preferred network type option.

2. For mainline, copy the getNetworkTypeFromRaf() from RadioFamily to
Settings.

Bug: 136730709
Test: Manual test & EnabledNetworkModePreferenceControllerTest
1. Enable allowed_network_type
2. Disable allowed_network_type
Merged-In: I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5

Change-Id: Id591f454a60d0ba08c3fc4a2ffe40836dafeb5f0
 2020-08-10 16:18:36 +08:00
Bonian Chen
a3e98a699e [automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8 am: caf6ede5f7 -s ours 
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4 is in history

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

Change-Id: Ia52ca5268d3eaa380df4e5eb90329cd7210aade9
 2020-08-10 07:36:17 +00:00
Bonian Chen
caf6ede5f7 Merge "[Settings] Code refactor" am: d1998a6fe8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366

Change-Id: Ie2a82c86d1ad63e92bebf69b0f98939a0b33f87e
 2020-08-10 07:20:10 +00:00
Bonian Chen
d1998a6fe8 Merge "[Settings] Code refactor" 2020-08-10 07:02:46 +00:00
Bonian Chen
daa07ea2d6 [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours 
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a is in history

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

Change-Id: I4fe7fe78122bfd753f9c407a5e3013c0886d4623
 2020-08-10 06:27:20 +00:00
Bonian Chen
d97cb511ac Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I252c98b9f0f17c42cd8b38d724a68d22db3626ca
 2020-08-10 06:10:02 +00:00
Bonian Chen
c1ec7f1fea Merge "Replaced reference to setPreferredNetworkType" 2020-08-10 05:51:23 +00:00
Bonian Chen
e3f6b13fb0 [Settings] Code refactor 
Remove unused import

Bug: 10956255
Test: build pass
Merged-In: I256870483d85bf7000556357071834cad24884d1
Change-Id: Iced417b1e84ac082ec9bdffb0634ca9d4597e9e1
 2020-08-07 07:51:35 +00:00
Bonian Chen
6343b81231 [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours 
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: I242f384a9374e8d0b8c7a4121839140ab1d174fc
 2020-08-07 07:26:44 +00:00
Bonian Chen
f1dbf2bd5e [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours 
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: Ie88640e9331b88eb45be68242ee9cdbfb5d752a7
 2020-08-07 07:26:31 +00:00
Bonian Chen
7f567d422b Merge "Remove the second network scan." am: 99a7c3ef00 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393365

Change-Id: I84fd87b8ce8f116ba291159c2cf8e39198d05c2b
 2020-08-07 07:16:37 +00:00
Bonian Chen
4d01040160 Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393239

Change-Id: I5b928212912c02f46f2e1d1edcd95cb8b45c5499
 2020-08-07 07:16:25 +00:00
Bonian Chen
99a7c3ef00 Merge "Remove the second network scan." 2020-08-07 07:06:31 +00:00
Bonian Chen
37a0c3873f Merge "The text on toast should be changed when remains 1 time for SIM lock input" 2020-08-07 07:04:36 +00:00
Bonian Chen
c753471a4d [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours 
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: I90e103ef95b51c2f8736fa95b81d0259e8d7f51a
 2020-08-07 07:04:08 +00:00
Lee Chou
4fd08a2145 Replaced reference to setPreferredNetworkType 
replaced with @SystemApi setPreferredNetworkTypeBitmask

Bug: 147405973
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest

Merged-In: I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b
Change-Id: Ia66cfc8fe109cfc038a8b53969bcd562727dbbc2
 2020-08-07 14:59:38 +08:00
Bonian Chen
9a5a1eabb6 Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393367

Change-Id: I079dd54dd80f39853861f7a27ec9ac24404cc494
 2020-08-07 06:54:41 +00:00
Bonian Chen
64c40305b4 Merge "Add NR Global to the logic to check if it is Global" 2020-08-07 06:42:10 +00:00
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
TreeHugger Robot
ad4bd4cb82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bc4c3c0c35498d042201c276bbf9284141bf94c
 2020-08-07 06:17:01 +00:00
TreeHugger Robot
37a3d091ba Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-08-07 06:02:58 +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
85ace93774 [automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 am: 5bf89f4f5a -s ours 
am skip reason: Change-Id I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 with SHA-1 4ecff2c833 is in history

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

Change-Id: I9255cfd3c8941b049c752b1dc4d4a1dfa1c84879
 2020-08-07 04:41:20 +00:00
Bonian Chen
deb24b6aec [automerger skipped] Merge "[Settings] Code refactor" am: 2410478bee am: 43a78331d5 -s ours 
am skip reason: Change-Id I060e7c880d91a0e5059610c5ceae319d47c19c7a with SHA-1 9bc2f7f8bc is in history

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

Change-Id: I605e256d129e4ed4f324624772505bbd1d00fc3f
 2020-08-07 04:41:11 +00: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
The Android Open Source Project
ff86e0d371 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b19ecf8d43f7c9c20db6a995bb7def64688f5a8
 2020-08-07 02:50:57 +00:00
The Android Open Source Project
c13c712b58 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3bb874713476b81f55c01ce7e216a9c45cd5a4c4
 2020-08-06 19:08:08 -07:00