Commit Graph

89951 Commits

Author SHA1 Message Date
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
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
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
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
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
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
e68805950d Merge "Null check added when updating the roaming status." into sc-dev 2021-06-23 10:27:32 +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
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
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
TreeHugger Robot
95f9bff288 Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: b1098f023f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

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

Change-Id: I4e77cb4f636e13a0d74f8c2903ccb5c8722027d2
2021-06-23 06:35:04 +00:00
TreeHugger Robot
74a3f9c7da Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31 am: 2686aa70c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I6fd336f2c276cd17542dad23648cda539fe99d59
2021-06-23 06:34:58 +00:00
TreeHugger Robot
93393e0267 Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: f791f3b988
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

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

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

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

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

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

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

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

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

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

Change-Id: I810aaf8bdc71dc41ff0badaa1c1e2452976f46d2
2021-06-23 06:24:03 +00:00
Jason Hsu
200bc6e161 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev 2021-06-23 06:04:01 +00:00
Stanley Wang
6830de5512 Merge "Refine the About phone page." into sc-dev am: 95f2a11593 am: b1e460fd92 am: 202178531b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: I4a89be70c84f31304b390c5c0675b5f9a7d2f526
2021-06-23 05:39:00 +00:00
Stanley Wang
e0171b6879 Merge "Refine the About phone page." into sc-dev am: 95f2a11593 am: bb28038f37 am: ce0e2a5e3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: I823412cbc903cd9680d1a5b1cb48fd0f165ffa79
2021-06-23 05:38:36 +00:00
TreeHugger Robot
94bc9d4c31 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev 2021-06-23 04:24:29 +00:00
jasonwshsu
aab1b7412a Fix "Dark theme" can not be searched by keywords
Root cause: Misadded into night display

Solution: Add them back into dark ui

Fix: 191828775
Test: manual test
Change-Id: I93cc0dd6231602f4705a894a86dbf4cc278766d6
2021-06-23 12:09:58 +08:00
TreeHugger Robot
60b63d549a Merge "Fix missing share context option in settings app" into sc-dev 2021-06-23 03:47:39 +00:00