Commit Graph

84871 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Peter_Liang
e9d0590b24 Fixing the SettingsRoboTest failure of the AnimatedImagePreference.
Root cause:
Seem to need lottie raw resource when inflating the LottieAnimationView.

Action:
Use the mock for LottieAnimationView to avoid init when inflating the layout.

Bug: 191251677
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AnimatedImagePreferenceTest
Change-Id: I0197442e5a65b40142b128f28a1c6bcd7cd3a0bd
2021-06-23 18:03:11 +08:00
Tsung-Mao Fang
df00a3bc69 Consistent color between status bar and app bar
In Android S, we add the transparent color to navigation bar
and status bar for consistent color between status bar and
app bar. So, we should add this change for oveall setting
theme since most pages should apply new app bar now.

Thus, we don't need to override the subsetting style for different
activities one by one.

Homepage doesn't have new Android S tool bar, so we shouldn't adopt it.

Test: Try to launch all the pages as many as possible.
Fix: 190797935
Change-Id: Ic4083de5477371f1d0eea2d66f020e4469fa3f86
2021-06-23 17:53:59 +08:00
Alex Johnston
e92f5df3be Update CA certificate warning to material next spec
* Fix colour extraction
* Update landscape mode
* Update logo

Screenshots:
* https://screenshot.googleplex.com/5mwbKLJeFVecrpi
* https://screenshot.googleplex.com/9z62Sw26NX5Zfwu

Bug: 191845997
Test: Manual testing with Settings
Change-Id: Id9988dbce9eabc2b69dba4bd20ca7a6729601147
2021-06-23 10:36:17 +01: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
Tim Peng
c3c6d6d876 Sound panel doesn't match material next design for Android S
-title layout/margin/font size adjustment
-remove panel gap on left and right sides
-apply round corner 28dp only on top two corners

Bug: 191317779
Test: make -j50 RunSettingsRoboTests
Change-Id: I8ebd9238a7e746a48ae6baa4361600b5a21446c1
2021-06-23 16:01:14 +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
Bonian Chen
2a1344a50e [Settings] Code Refactor - ActiveSubsciptionsListener
Fix the spelling with "ActiveSubsciptionsListener" into "ActiveSubscriptionsListener".

Bug: 191321218
Test: build pass
Change-Id: I7282c7ba9fbb793056c12928843b6eef59eb2213
2021-06-23 07:34:00 +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
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
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
Jason Hsu
200bc6e161 Merge "Fix "Dark theme" can not be searched by keywords" into sc-dev 2021-06-23 06:04:01 +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
Stanley Wang
202178531b Merge "Refine the About phone page." into sc-dev am: 95f2a11593 am: b1e460fd92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

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

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

Change-Id: Id7c4282c9c1a3f7600def2a0ae592b4ef14eea87
2021-06-23 03:17:55 +00:00
Stanley Wang
b1e460fd92 Merge "Refine the About phone page." into sc-dev am: 95f2a11593
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: I9a3793a895c09b4fc6a8da07bfd9e6022ca05a6a
2021-06-23 03:17:05 +00:00
Stanley Wang
95f2a11593 Merge "Refine the About phone page." into sc-dev 2021-06-23 03:00:19 +00:00
Yi Jiang
5bfb7f9380 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 am: 708845caca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: Ic83a0e6f253ca22474addfd35b93d44f2245480f
2021-06-23 00:18:46 +00:00
Matt Pietal
3947c8852c Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 7922f41d88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I9fa2597b8c9d4f6e5963288bb6f453e2d87d9d7a
2021-06-23 00:18:38 +00:00
Arc Wang
5e7a242c8f Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: 9c30b55beb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I5938a686365ce08d392565c6cddcc8401bbc384e
2021-06-23 00:18:30 +00:00
TreeHugger Robot
e97da100dd Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15 am: e62bae21db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866

Change-Id: I2c7c2727dd932ee4d6d344810275993eb25c8e7a
2021-06-23 00:18:01 +00:00
TreeHugger Robot
a623c1cd41 Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c am: 4b13bd3517
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: Id37d1a8d8121c4be13c29dc666260e5124eeb2ed
2021-06-23 00:15:28 +00:00