PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,483 Commits 1 Branch 0 Tags
b23c8335fb4ca07bc3ba41feafc97cecd602aedc
Commit Graph

71483 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
Jeffrey Carlyle
f22059f21f Add BatteryStatusFeatureProvider 
This allows the battery header status line to be overridden.

Bug: 150239363
Test: implemented provider and changed status line text
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Change-Id: I05bedbee641f087de5ee1b25a00724ce2de51f87
Merged-In: I05bedbee641f087de5ee1b25a00724ce2de51f87
 2020-08-11 13:49:27 -07:00
Bonian Chen
0083abcd3b [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -s ours am: 6e8d241cd9 -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: Id0fff72461e532250c723b29a13036146c172f48
 2020-08-11 09:15:16 +00:00
Bonian Chen
6e8d241cd9 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -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: I16c99ac5fe38cb7391858d02abd4b21539d6d032
 2020-08-11 08:57:21 +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
cb6df05e95 [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours am: e8c233c4dc -s ours am: 41a77501c3 -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: I0d12957f0e00665646d7be0b1d919033450d7fbc
 2020-08-11 03:35:42 +00:00
Bonian Chen
41a77501c3 [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours am: e8c233c4dc -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: I4e6af4b49d9e9649a790f32a72ccb8b6d5d138c5
 2020-08-11 03:18:30 +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
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
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
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
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