PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,333 Commits 1 Branch 0 Tags
c20d521be073965e50f6531db2ebbd21f24fb084
Commit Graph

70333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c20d521be0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874 -s ours am: f90d25620d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45a9b1c6d35d0a39637747f7d4714126f8e2bdb8
 2020-08-10 17:37:23 +00:00
TreeHugger Robot
f90d25620d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic77a45f1573b50befe00545853cf774ade34f7fa
 2020-08-10 17:16:16 +00:00
TreeHugger Robot
1419ef2874 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-10 17:03:22 +00:00
Bonian Chen
86a0d8c7cb [automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea am: 8977c4ce49 -s ours am: 528b77a6e3 -s ours am: 06b5916f4f -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: I5703e91daee635e36f2c3a71d12bbcd220978d72
 2020-08-10 12:17:45 +00:00
Bonian Chen
06b5916f4f [automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea am: 8977c4ce49 -s ours am: 528b77a6e3 -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: I468782ddc0c2afd6e353194c051fd5a6508c1b30
 2020-08-10 12:02:02 +00: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
f9573a79cd [automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c am: 80b3bb5141 -s ours am: cfe7584cec -s ours am: db42e97e81 -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: I99939c5b5640de3af3ceb7624c893c4a4a101b2d
 2020-08-10 11:27:36 +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
db42e97e81 [automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c am: 80b3bb5141 -s ours am: cfe7584cec -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: I235aaed5dce0a37f429db30ffb6b16a417a8f94d
 2020-08-10 11:09:23 +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
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
3dfd917c08 [automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8 am: caf6ede5f7 -s ours am: a3e98a699e -s ours am: f774cdf0ee -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: I139973afc6f78d0fec44eff9e476c1dbaaac65c5
 2020-08-10 08:09:46 +00:00
Bonian Chen
f774cdf0ee [automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8 am: caf6ede5f7 -s ours am: a3e98a699e -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: I81d83289d2daf8a13677c0aba58e81cfcb587656
 2020-08-10 07:57:03 +00: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
SongFerng Wang
e0315e1a7f Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: cf614aa1ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I3a227938ed47529d18c58afdc98b711a1e49921a
 2020-08-10 07:27:08 +00:00
SongFerng Wang
e0fd5aa92a Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: a19f93e7f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I0c4a0a515d23a79315908e6a790a590cc2e6cdb3
 2020-08-10 07:25:58 +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
SongFerng Wang
cf614aa1ee Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: Ie601f7835d5cb99dbd1491deaae5ed394a94c549
 2020-08-10 07:10:26 +00:00
SongFerng Wang
a19f93e7f6 Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I5b0386cc82ff7fc8383cd5eebab929e0d8a6458a
 2020-08-10 07:09:03 +00:00
Bonian Chen
d1998a6fe8 Merge "[Settings] Code refactor" 2020-08-10 07:02:46 +00:00
Bonian Chen
18a663c92d [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours am: daa07ea2d6 -s ours am: efb6d09d0f -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: Id316d5f7916e7e39719b73ff12bcf9980e720f16
 2020-08-10 07:01:31 +00:00
SongFerng Wang
ddc238c15e Merge "Manual selection item's data icon is wrong" into rvc-d1-dev 2020-08-10 06:52:48 +00:00
Bonian Chen
efb6d09d0f [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours am: daa07ea2d6 -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: I6292dce2e89cbff4486490af0ae08115478b855a
 2020-08-10 06:46:52 +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
Bill Yi
ca593c59ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e85177b1bc1790aa8af1563db011d61249a4056
 2020-08-09 09:26:09 -07:00
Bill Yi
c19f0a3aab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 88558e8940 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id678d1fe415daee63ec0c0395c0fb276c48dece6
 2020-08-08 20:17:23 +00:00
Bill Yi
b8a813bb24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 064ba89fc3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie242c290b510311f48b8804fe3e79874de90e3cf
 2020-08-08 20:16:18 +00:00
Bill Yi
88558e8940 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77c4998fa1886c8768626db6f8c3848160bf00a2
 2020-08-08 19:59:01 +00:00
Bill Yi
064ba89fc3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
 2020-08-08 19:57:42 +00:00
Bill Yi
10e95dc4d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e6cf5a03b4cef0d9e45ddd55e048376bafc7e16
 2020-08-08 19:49:23 +00:00
Bill Yi
7e18f9f537 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I49ca37ad76af4049e36d41140610b131f99bf46e
 2020-08-08 16:11:50 +00:00
Bill Yi
80d8d4d07c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9584a9b4b73a955be75ed4957eeb01e88a6c745a
 2020-08-08 15:32:24 +00:00
TreeHugger Robot
8d2b8304ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a5d22b1b18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0a60ed433906d7f8d95c7cbd60a7c352dec72b7
 2020-08-07 17:57:56 +00:00
TreeHugger Robot
171d1b98f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d032e7ac90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d47939545848a89498c68db785a7c4da95a6e71
 2020-08-07 17:57:47 +00:00
TreeHugger Robot
a5d22b1b18 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-07 17:41:57 +00:00
TreeHugger Robot
d032e7ac90 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-07 17:39:13 +00:00
Automerger Merge Worker
0fe2efd3be Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 352259e384 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 15:11:01 +00:00
TreeHugger Robot
9f783aa73b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 352259e384 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc5daff87a690f0593f4beee30e0c5faed8460a8
 2020-08-07 15:10:56 +00:00
TreeHugger Robot
ae418fc5e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 203bb3924e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3396b7edb5cf9599ca36236139f4737668025bc
 2020-08-07 15:10:53 +00:00
TreeHugger Robot
352259e384 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica5ba9d21d38210c1cb7ec597f314736fd34707d
 2020-08-07 15:01:31 +00:00
TreeHugger Robot
203bb3924e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia45d69e65757280f755404f1209c12ac5b17ba59
 2020-08-07 15:01:27 +00:00
TreeHugger Robot
1da29b3f77 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-07 14:45:54 +00:00
TreeHugger Robot
48d768b00c Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev am: edd587c2a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167384

Change-Id: I41175eb59b2cea6dfeb97d1413ab6c4846ddb844
 2020-08-07 11:49:39 +00:00
TreeHugger Robot
edd587c2a6 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev 2020-08-07 11:37:27 +00:00