PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,970 Commits 1 Branch 0 Tags
84d94dc01d63bc74d29be20bb43e46a1f77e1f27
Commit Graph

89970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
84d94dc01d Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: a72deb37bd am: f02c0e2deb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I83885a2ea66a64b22cb5da4029095d8e493e94e8
 2021-06-23 10:58:41 +00:00
TreeHugger Robot
609fdc112b Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 673ee6ed51 am: 14aac782a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I2359d0b407ea2b710d6e6ea8a1b2f7572a6728d6
 2021-06-23 10:58:35 +00:00
TreeHugger Robot
bb8a7f1c1f Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 137e14b6af am: 3a4fcb300f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I419cf1d717ffe46ce75c2642d4f045d9eedf0c1f
 2021-06-23 10:58:30 +00:00
Jeremy Goldman
fc53d97dfe Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: 5f439a69e3 am: bd01f6b247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: Ife813e719d06ea71d770efe9074f83e998e85f77
 2021-06-23 10:58:24 +00:00
TreeHugger Robot
21d3286d5a Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 70af2a91a9 am: 1bc83c7062 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I806b863636a2a240658a7037678fc23f593f24e8
 2021-06-23 10:58:18 +00:00
Automerger Merge Worker
d17d296fe5 Merge "Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508" into sc-v2-dev-plus-aosp am: 7d5192ad0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: Ibca7b7021740a54ce8a845624f67f166dbb4f814
 2021-06-23 10:58:13 +00:00
TreeHugger Robot
d6a80a443b Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 6f7dc069c3 am: 86c9dedfb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ibc70d75e243afb072a67f1b81c72d232c8df9a66
 2021-06-23 10:58:04 +00:00
TreeHugger Robot
4316fb45dc Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 3f3034c2db am: 5764de71ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ibe5de8797f5372a0db037036a2a2a33134e71258
 2021-06-23 10:57:50 +00:00
Jeremy Goldman
f02c0e2deb Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: a72deb37bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I13613d3a939968c57c70e8aba15780a9d5e7e61a
 2021-06-23 10:48:19 +00:00
TreeHugger Robot
14aac782a5 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 673ee6ed51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I774d439e5c9d6a48c515dbdf5c36e9833c88d89a
 2021-06-23 10:48:14 +00:00
TreeHugger Robot
3a4fcb300f Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 137e14b6af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I8d6c57741d63e2e8b4f58f3bf53474f77cb8c0b1
 2021-06-23 10:48:10 +00:00
Jeremy Goldman
9faf67d489 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: e0cb5e6c51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I8e2c5fc303173ede88c46659ed9f7e6769fe62ab
 2021-06-23 10:47:49 +00:00
Jeremy Goldman
bd01f6b247 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: 5f439a69e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I89448ee0daad787803e9d04cc00f4cd090dfb853
 2021-06-23 10:47:46 +00:00
TreeHugger Robot
37fada87a3 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: bffc06f40d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I8d7e2612ce6f82917f0005c62e1e8de6a96550d2
 2021-06-23 10:47:44 +00:00
TreeHugger Robot
1bc83c7062 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: 70af2a91a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: Id855f19cd171e231ecf90d9d594b806149c2c3eb
 2021-06-23 10:47:42 +00:00
Automerger Merge Worker
7d5192ad0f Merge "Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508" into sc-v2-dev-plus-aosp 2021-06-23 10:47:39 +00:00
TreeHugger Robot
33b8710479 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: c4501805c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I0f21062b2df8ea153601bba68338dbf5459b03e8
 2021-06-23 10:47:39 +00:00
TreeHugger Robot
2f1afd7d83 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: 55b7b6b508 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I9018efaa52ce217501b5c188260e2385cb6e0c02
 2021-06-23 10:47:37 +00:00
TreeHugger Robot
86c9dedfb1 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 6f7dc069c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: I5f8cc290226279d547e272d2d1137053cfe24b96
 2021-06-23 10:47:36 +00:00
TreeHugger Robot
1777344309 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: a4b5ecc5f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ic674efa0599fb80487d1af4bfcd0c8030092365a
 2021-06-23 10:47:33 +00:00
TreeHugger Robot
5764de71ed Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: 3f3034c2db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Id67b1bd720c833d16de76b7d36023ba567a464ea
 2021-06-23 10:47:19 +00:00
Jeremy Goldman
5f439a69e3 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I55f965d4d0e22cca68455eb0a71ee1c1f9894d31
 2021-06-23 10:31:21 +00:00
Jeremy Goldman
e0cb5e6c51 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I0fcc70fb8de50c9479233e99a02b71af4a5c860a
 2021-06-23 10:30:23 +00:00
Jeremy Goldman
a72deb37bd Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I6d16a6d94b2ff98d2382f0edf0a6b572fc2c8551
 2021-06-23 10:30:19 +00:00
Jeremy Goldman
e68805950d Merge "Null check added when updating the roaming status." into sc-dev 2021-06-23 10:27:32 +00:00
TreeHugger Robot
70af2a91a9 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I35dfc64db55fa76328ea7848185284d59f03614d
 2021-06-23 10:27:26 +00:00
TreeHugger Robot
55b7b6b508 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: Ife15d5ec66937c5303b24a74164733838ab3a6fa
 2021-06-23 10:27:13 +00:00
TreeHugger Robot
3f3034c2db Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: I154f60cc017cc1ff063459953c8d5171653d69ea
 2021-06-23 10:27:02 +00:00
TreeHugger Robot
673ee6ed51 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I821e5cc867d5d0d997c314ae0ee15f7547038c34
 2021-06-23 10:26:46 +00:00
TreeHugger Robot
bffc06f40d Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I96c848014cfa89891063f6d96c1adae4028b8f4f
 2021-06-23 10:26:46 +00:00
TreeHugger Robot
137e14b6af Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: Iad43cea522add591f04cf9b8d0fc9149a91cdab0
 2021-06-23 10:26:23 +00:00
TreeHugger Robot
c4501805c9 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I6f829f5473ddf9ec3181dc4fc021aa0d58fa1579
 2021-06-23 10:26:23 +00:00
TreeHugger Robot
a4b5ecc5f9 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: I0af12140f7906e6e7da55af995ccd32a868b0272
 2021-06-23 10:26:05 +00:00
TreeHugger Robot
6f7dc069c3 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: I48a6e673d3aa12c9e23f3fb4d400356cf7ff9cc7
 2021-06-23 10:26:03 +00:00
TreeHugger Robot
b86f0c0472 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev 2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev 2021-06-23 10:11:33 +00:00
TreeHugger Robot
74babf6e91 Merge "Fix the NPE issue" into sc-dev 2021-06-23 10:10:22 +00:00
Weng Su
362bf07919 [Provider Model] Add Wi-Fi toggle in internet panel 
- Add a new slice row for Wi-Fi toggle in the network lists

- Increase the maximum number of network lists to 6

Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
 2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2 [Provider Model] Show carrier network to internet preference 
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
 2021-06-23 15:55:24 +08:00
Jason Hsu
ebfc6df5f5 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev am: 200bc6e161 am: 69dd166091 am: f1919c2c30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067018

Change-Id: Ice9b631585f768404437f0af71694826dfb5479e
 2021-06-23 06:59:13 +00:00
TreeHugger Robot
d107123903 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31 am: 2c2be0c78a am: bbf50c8e51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I645113c655c4ba64f3fdaebaa77d493ebff713f7
 2021-06-23 06:59:01 +00:00
TreeHugger Robot
db58d3362e Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: 19c1872cfd am: d75803044a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: Iee4523eb534d18c3ca8fb3b341e6028d51c2c829
 2021-06-23 06:58:36 +00:00
Jason Hsu
7b0e9d4408 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev am: 200bc6e161 am: 6eecafcda9 am: badd25a02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067018

Change-Id: If5f4f906d45a03633b29d8ba1314ae2b61002069
 2021-06-23 06:58:04 +00:00
TreeHugger Robot
a65342d5a1 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31 am: 2cd4a9ebe6 am: b04030eb82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I45dceef36b58bf3a1e496de30b90b70810a3cc3a
 2021-06-23 06:57:23 +00:00
TreeHugger Robot
bb438a3306 Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: b1098f023f am: 95f9bff288 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: I15192b70781c52fa2686b49c503046a616b7951a
 2021-06-23 06:53:53 +00:00
Jason Hsu
f1919c2c30 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev am: 200bc6e161 am: 69dd166091 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067018

Change-Id: I3e3ddc1d901093da95cce894a7d710a4b6e81f9d
 2021-06-23 06:41:40 +00:00
TreeHugger Robot
bbf50c8e51 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31 am: 2c2be0c78a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I01f70ba96cf9752224df4c75c95095cd82ba3c74
 2021-06-23 06:41:35 +00:00
TreeHugger Robot
d75803044a Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: 19c1872cfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: I5f0ca5c453e13ec3a68c8364739dc2ada513dc50
 2021-06-23 06:41:15 +00:00
Jason Hsu
badd25a02b Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev am: 200bc6e161 am: 6eecafcda9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067018

Change-Id: I565c0e32177272eda3ed4efc2cdc49a4e3b31d50
 2021-06-23 06:36:10 +00:00
TreeHugger Robot
b04030eb82 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31 am: 2cd4a9ebe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I2677573892f9dbbe85a73c947b1409fcd7520377
 2021-06-23 06:36:01 +00:00