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
TreeHugger Robot
efc601f4a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: 56f65fed8f
-s ours am: 326ed12f4c
-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: I463e6332499ae8cf1481a310531350f7ec56b24a
2020-08-10 17:54:28 +00:00
TreeHugger Robot
9f0f960e48
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: f90d25620d
-s ours am: c20d521be0
-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: I71c3bded604586ccbf7bf90eb55af6562f28dd65
2020-08-10 17:53:25 +00:00
TreeHugger Robot
326ed12f4c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1419ef2874
-s ours am: 56f65fed8f
-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: Idc7c858d661a0b9e763e0a93cdd9ed3bdf377c99
2020-08-10 17:38:22 +00:00
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
56f65fed8f
[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: I2fb7a80bdf3e12d70c16db7cdd1602ec5acd4f68
2020-08-10 17:17:25 +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
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
d6e2980e9a
[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: 86a0d8c7cb
-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: I0a5918b92afb1aa4630ad89f2d0ebf145181225d
2020-08-10 12:34:04 +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
0ed11daae3
[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c
am: 80b3bb5141
-s ours am: cfe7584cec
-s ours am: db42e97e81
-s ours am: f9573a79cd
-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: Ie7d33c7bd57c4401ca9c07e6526333e056cca90e
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
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
Bonian Chen
279ececac8
[automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8
am: caf6ede5f7
-s ours am: a3e98a699e
-s ours am: f774cdf0ee
-s ours am: 3dfd917c08
-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: Ic9da37dcb5a6a0314f968abc47e331deb0be4444
2020-08-10 08:25:49 +00: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
SongFerng Wang
79905fd73e
Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e
am: cf614aa1ee
am: e0315e1a7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249
Change-Id: I444949c42e2d339bc0fb3772ffec85c4fb34fe55
2020-08-10 07:45:06 +00:00
SongFerng Wang
b5f1c1b819
Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e
am: a19f93e7f6
am: e0fd5aa92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249
Change-Id: I9b9571f8ff033530f80823aec6b4321ce604272a
2020-08-10 07:44:41 +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
Bonian Chen
638081c98b
[automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
am: d97cb511ac
-s ours am: daa07ea2d6
-s ours am: efb6d09d0f
-s ours am: 18a663c92d
-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: I3ac6bcd527bc8293d189df29be2dd8228b23c03a
2020-08-10 07:18:42 +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
PETER LIANG
946dafab93
Merge "Fix the screen scrolling down after enabling dark theme."
2020-08-10 03:56:44 +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
502c4207f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 88558e8940
-s ours am: c19f0a3aab
-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: I25752bf3e4f3e1b51416ea923cd872049498d9b8
2020-08-08 20:35:52 +00:00
Bill Yi
be15bdbc8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c
-s ours am: 064ba89fc3
-s ours am: b8a813bb24
-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: I619861f453915a735a1c2a507e5aa39c084e2250
2020-08-08 20:35:46 +00: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