Commit Graph

40480 Commits

Author SHA1 Message Date
Alex Johnston
a0ddbe36d6 Merge "Add non system overlay flag to InstallCaCertificateWarning" into sc-v2-dev am: 86cee74361 am: 62ab8f5847
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16358378

Change-Id: I73b5e496f4a2d8f206f23e775816a70ff20fc0a7
2021-12-02 16:05:03 +00:00
Alex Johnston
62ab8f5847 Merge "Add non system overlay flag to InstallCaCertificateWarning" into sc-v2-dev am: 86cee74361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16358378

Change-Id: If2ceb7cc90fd16ea20e22fde771bb8ccc63842a6
2021-12-02 15:50:18 +00:00
Alex Johnston
86cee74361 Merge "Add non system overlay flag to InstallCaCertificateWarning" into sc-v2-dev 2021-12-02 15:34:01 +00:00
Jason Hsu
4c450d6b4c Merge "Align the "Open activity" UI style with usual accessibility service "Use service"" into sc-v2-dev am: 5c90a9c225 am: 8216c769a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16321718

Change-Id: I7fdcacbe0cc5939d84e08c5e220ef85956cf2ba8
2021-12-02 11:42:11 +00:00
Jason Hsu
8216c769a9 Merge "Align the "Open activity" UI style with usual accessibility service "Use service"" into sc-v2-dev am: 5c90a9c225
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16321718

Change-Id: I56bfde017611f42e38d16488a5fa02f18d2db253
2021-12-02 11:27:03 +00:00
Bonian Chen
6c3320eabb Merge "[Settings] Refactor Wifi Calling description text" 2021-12-02 11:05:28 +00:00
Jason Hsu
5c90a9c225 Merge "Align the "Open activity" UI style with usual accessibility service "Use service"" into sc-v2-dev 2021-12-02 11:01:49 +00:00
TreeHugger Robot
3d8edf8e43 Merge "Fix the background color of CollapsingToolbarLayout" into sc-v2-dev am: d355d7f123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16284152

Change-Id: I2203f0844c527bf1ac7934b1d711117397ed120c
2021-12-02 07:54:01 +00:00
TreeHugger Robot
d355d7f123 Merge "Fix the background color of CollapsingToolbarLayout" into sc-v2-dev 2021-12-02 07:19:45 +00:00
Mill Chen
3825bff021 Fix the background color of CollapsingToolbarLayout
The wrong background color of CollapsingToolbarLayout appears in some
pages like "All apps" page or "Password and accounts" page. This symptom
can be observed in these pages when the work profile is enabled and the
line count of title is 1.

This issue is caused by updating the title of the page many times. In
these pages that have the tab view, the structure of the page differs
from a general setting page. The title of the page is coming from
BaseActivity, ProfileSelectFragment, PersonalFragment and WorkFragment,
in which the page that has the issue has an empty string from
ProfileSelectFragment. That is causing the CollapsingTollbarLayout has
the different line count during the process of setting the title.

Since the pages that have the tab view are different from the general
pages in Settings, the title should be set separately for those pages.
Adding a method to get the title resource ID so the page extending from
ProfileSelectFragment can set its title.

Bug: 192914660
Test: visual test and manual test
1) Enable work profile
2) Navigate to All apps page
3) The page should have the correct background color in the
CollapsingToolbarLayout

Change-Id: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
Merged-In: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
2021-12-02 13:40:45 +08:00
TreeHugger Robot
9e978441af Merge "Fix the background color of CollapsingToolbarLayout" 2021-12-02 05:26:01 +00:00
TreeHugger Robot
fff560a4bd Merge "Set property based on gesture option changed." 2021-12-02 05:14:31 +00:00
Super Liu
65d46d6ee4 Set property based on gesture option changed.
System software could do the runtime configuration based on
this added property.

Bug: 193467627
Test: manual test.
Signed-off-by: Super Liu <supercjliu@google.com>
Change-Id: I1897320e1c5d5d446727899328363e6a714983f8
2021-12-02 09:47:02 +08:00
Joshua Mccloskey
cc179be29f Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b804f am: 78ab60db84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: Ic324c6829d8dfa180ca7e0aaf5d8841c0e76dd88
2021-12-01 23:43:01 +00:00
Joshua Mccloskey
78ab60db84 Merge "Fixed face enroll intro button issue" into sc-v2-dev am: 506c6b804f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16365598

Change-Id: I2236768c62d8a8b48a4b4348b5e02bb7beb3c31f
2021-12-01 23:25:22 +00:00
Joshua Mccloskey
506c6b804f Merge "Fixed face enroll intro button issue" into sc-v2-dev 2021-12-01 23:08:49 +00:00
Joshua Mccloskey
3d5c9011f0 Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79 am: e372b2a22b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I32ecd37e6f3937a845ee2637b9774455a8bac81b
2021-12-01 18:08:55 +00:00
Joshua Mccloskey
e372b2a22b Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I9a4e565b311d7a65091aca5294879366b9399265
2021-12-01 17:19:04 +00:00
Joshua Mccloskey
1ca42ffc79 Merge "Disable setting if sensor is convenience." into sc-v2-dev 2021-12-01 17:09:50 +00:00
Mill Chen
28bc1c04b9 Fix the background color of CollapsingToolbarLayout
The wrong background color of CollapsingToolbarLayout appears in some
pages like "All apps" page or "Password and accounts" page. This symptom
can be observed in these pages when the work profile is enabled and the
line count of title is 1.

This issue is caused by updating the title of the page many times. In
these pages that have the tab view, the structure of the page differs
from a general setting page. The title of the page is coming from
BaseActivity, ProfileSelectFragment, PersonalFragment and WorkFragment,
in which the page that has the issue has an empty string from
ProfileSelectFragment. That is causing the CollapsingTollbarLayout has
the different line count during the process of setting the title.

Since the pages that have the tab view are different from the general
pages in Settings, the title should be set separately for those pages.
Adding a method to get the title resource ID so the page extending from
ProfileSelectFragment can set its title.

Bug: 192914660
Test: visual test and manual test
1) Enable work profile
2) Navigate to All apps page
3) The page should have the correct background color in the
CollapsingToolbarLayout

Change-Id: I52ef9729f3cad56161ea3d87ba25429dfcdb26ef
2021-12-01 18:44:42 +08:00
Tsung-Mao Fang
737288ff75 Update background color for two-pane mode am: 395ea90b83 am: e6a79f0670
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: Ifad1cd990154bc3e367921e94ea5c9d1d7b73ca5
2021-12-01 10:32:46 +00:00
Tsung-Mao Fang
e6a79f0670 Update background color for two-pane mode am: 395ea90b83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524

Change-Id: I2b4fffda97aaec53945c4de4cf6248fb81163e64
2021-12-01 10:22:01 +00:00
Tsung-Mao Fang
395ea90b83 Update background color for two-pane mode
Update background color for status bar and
homepage background programically.
Also, we update the backgroud color for highlight items.

Test: Rebuilt apk and see the screen.
Bug: 195293058
Change-Id: Id100f8c9c7fc02c43420afcca07a703a14ec2312
2021-12-01 16:39:09 +08:00
Joshua Mccloskey
756fa20e1c Fixed face enroll intro button issue
Fixed an issue where sometimes after completing face authentication the
more & agree buttons would display instead of the done button.

1. Enter SUW
2. Complete face authentication flow
3. Go to next step (finishing the Biometric flow)
4. Press the back button
5. Observe that the text now says "Done"

Fixes: 205203673
Test: Verified button text is changed as expected during SUW.
Change-Id: I5cfad265f9b27669dcad64e5872750695b1b5bdc
2021-11-30 09:29:13 -08:00
Alex Johnston
2f193c8157 Add non system overlay flag to InstallCaCertificateWarning
Bug: 196969991
Test: Manual testing with Settings
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
2021-11-30 16:28:31 +00:00
Pavel Grafov
e8d755061d Merge "Check user validity before retrying authentication" 2021-11-30 14:48:00 +00:00
Pavel Grafov
3a48226af1 Merge "Launch ForgotPasswordActivity in a new task." 2021-11-30 14:47:22 +00:00
Bonian Chen
8a892271da [Settings] Refactor Wifi Calling description text
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.

Bug: 204844012
Test: local
Change-Id: I60f339bf4adf50236d80176669a557c77f0d97ca
2021-11-30 13:55:55 +00:00
Zoey Chen
3581f65d85 Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439 am: 4aef8765dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: Ic4648dad4fd7950510fea2382fa990efe900baf8
2021-11-30 09:05:10 +00:00
Zoey Chen
4aef8765dc Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: I1a63b9d82fd530af87c2c70ab21e24e599a967e2
2021-11-30 08:46:59 +00:00
Zoey Chen
1df187a439 Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev 2021-11-30 08:33:50 +00:00
Zoey Chen
8b1ecea060 [Settings] Should show carrier network if airplane mode is on
https://hsv.googleplex.com/6007361661566976

Test: atest SubscriptionsPreferenceControllerTest
Bug: 206990845
Change-Id: Id39b662f33b201a8e4ce53c34c3007eca9a40edf
2021-11-30 12:10:28 +08:00
Joe Bolinger
54b4689e5a Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b am: 77556bcc51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I9c84fbac19a764c012168110db04832a4bf58e92
2021-11-29 23:46:30 +00:00
Joe Bolinger
77556bcc51 Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466

Change-Id: I08041af311deb454a3f05b9328955b6489a8f35a
2021-11-29 23:26:27 +00:00
Joe Bolinger
076dc5ee1b Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev 2021-11-29 23:15:15 +00:00
Adam Bookatz
cd429e74db Merge "Use UM.canAddMoreUsers and UM.isUserTypeEnabled" 2021-11-29 21:00:48 +00:00
Etienne Ruffieux
6a709815df Merge "Refactor Bluetooth scan mode APIs" 2021-11-29 20:27:45 +00:00
Bonian Chen
12287b2c67 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I37fd544ef7452a3286dd393d68407d626d9ab590
2021-11-29 06:23:02 +00:00
TreeHugger Robot
fb0ca145aa Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd am: c6bc7a7c4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: I8c1f0b3a19239f85a4f67b53dd703ed7a9d3a625
2021-11-29 06:15:11 +00:00
Bonian Chen
1026e410f4 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev 2021-11-29 06:05:40 +00:00
TreeHugger Robot
c6bc7a7c4b Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: Ib37dab22b51da7ec97990230a17b7fe698abee60
2021-11-29 05:59:08 +00:00
TreeHugger Robot
cd8a01d2fd Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev 2021-11-29 05:37:34 +00:00
Charles Chen
a1c4d9b702 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 am: 181853efb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: I8b990e14ceb2dce116d74dd670d36072d179555d
2021-11-29 05:20:52 +00:00
Charles Chen
181853efb0 Fix different behaviors of deeplink in one/two pane am: a8c97980a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: Ie2833c5b9b4f0f05a97432198a949050d3fb3e84
2021-11-29 05:02:31 +00:00
Treehugger Robot
689086b230 Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e am: 96d33dbdbe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
2021-11-29 04:56:43 +00:00
Treehugger Robot
96d33dbdbe Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
2021-11-29 04:44:02 +00:00
Treehugger Robot
7e7b1f720e Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
2021-11-29 04:27:25 +00:00
Treehugger Robot
ad041d78ee Merge "Minor clean-up for LE audio setting" am: e41d1b9761
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
2021-11-29 03:58:28 +00:00
Treehugger Robot
afa860da18 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 am: ff1ebb31d4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
2021-11-29 03:04:16 +00:00
Alice Kuo
2d0025761b Handle csip set member automatic pair in Setting am: 629611a43e am: eb412a0614 am: 6097f9b830
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: Icace2cf11100209eaa945971704b3319e9628e75
2021-11-29 03:04:15 +00:00