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
Bill Yi
8b7ed642d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours am: ae32f7324b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: I6fe074fb6d2ecf6abe738dee96588d5684bfcd6e
2021-12-01 18:07:49 +00:00
TreeHugger Robot
bb125913f0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 83fede5908
-s ours am: 3042f4621d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356719
Change-Id: I8ccd5b2d6e59c0883a7f03d30a0996f4f6054490
2021-12-01 18:07:40 +00:00
Bill Yi
0845cbd1b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours am: 4844909fbe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I75518960030ce5b91a026b0b7adc08f1ca375a82
2021-12-01 17:22:30 +00:00
Bill Yi
7b332c2f5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours am: 887f2b7e02
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: I285f04d126e007e4f17045d0a16092c022ffdc9b
2021-12-01 17:21:17 +00:00
Bill Yi
10d16d80c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: Iea8f622284dc73d2d089d57bc285445c1cbaa2cd
2021-12-01 17:20:34 +00:00
Bill Yi
ae32f7324b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: Ie62fe7a31ad3a11650aa423c0f1b3a6abbe7e23b
2021-12-01 17:19:22 +00:00
Bill Yi
4844909fbe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I31222683be6f79243f3ba10c325192ad7528d21d
2021-12-01 17:19:19 +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
TreeHugger Robot
41c84894fd
Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" into sc-mainline-prod am: 68745620f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I47e3d183bd36426f160c3729b28595ec3bc55872
2021-12-01 17:18:57 +00:00
Bill Yi
887f2b7e02
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: I176834d8b4dd5c41bb9514a5d998699d202652a3
2021-12-01 17:18:27 +00:00
Bill Yi
7946a90b42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I6bda0cb874bb45735cda3852876ace5d8eef1635
2021-12-01 17:18:20 +00:00
Bill Yi
44b1a40c39
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a725a5b0b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356906
Change-Id: I979f14ee18342691f593b3d90cdfe8aa2b991511
2021-12-01 17:17:55 +00:00
TreeHugger Robot
3042f4621d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 83fede5908
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356719
Change-Id: I777b93480c0cde0d38aaf9e9d17a4c0992a702dd
2021-12-01 17:17:48 +00:00
Joshua Mccloskey
1ca42ffc79
Merge "Disable setting if sensor is convenience." into sc-v2-dev
2021-12-01 17:09:50 +00:00
TreeHugger Robot
83fede5908
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-01 16:59:42 +00:00
TreeHugger Robot
68745620f7
Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
Import translations. DO NOT MERGE ANYWHERE
2021-12-01 16:59:26 +00:00
TreeHugger Robot
639fc50211
Merge changes from topic "presubmit-am-ea97047cb12a4d7ba090018d262e4d7e"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
2p: 8ab551fd7b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
Import translations. DO NOT MERGE ANYWHERE
2021-12-01 16:59:26 +00:00
TreeHugger Robot
a7fc80478d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-12-01 16:55:04 +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
Joe Bolinger
dde461dc4e
Remove portrait flag from handoff activity.
...
Fix: 206904426
Test: manual (adb root && adb shell am start -n com.android.settings/.biometrics.BiometricHandoffActivity and rotate device)
Change-Id: Ibe61484d88824418f395247e492aba7b9d3c912a
2021-12-01 00:59:57 +00: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
010306644b
[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: Ie89a5b65e75cdd61fab68c6e1bf7c40bfcc68b6b
2021-11-30 13:57:56 +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
Bonian Chen
3dfad58897
[Settings] support of getPhoneNumber API
...
Access to new API for retrieving phone number.
Bug: 208321353
Test: local build pass
Change-Id: I8484f94934670f24c80c95df89e8752420c1f439
2021-11-30 11:04:38 +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
Joshua Mccloskey
b73201c6be
Added sensorPrivacyDialog to face settings
...
Test: Verify flow presents dialog if the privacy setting is enabled.
Bug: 201045056
Change-Id: I96f14db457311d13f07c770ff0993581576c5dba
2021-11-29 23:09:16 -08: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
Andrew Zeng
c71fe8cab1
Remove unncessary constraintlayout-solver deps
...
This will be cp'ed to master later
Bug: 192617148
Test: compiles
Change-Id: Id7a9cf6c26ff9dd464d8f0b0f012b8480ca70b92
2021-11-29 23:32:10 +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
Bill Yi
12a5d03d9f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic0a4b094fdd4f7898eb3726ba17b23a3563acb2a
2021-11-29 08:56:17 +00:00
Bill Yi
1b3c701077
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic270445cc1d57212de38787fab18a2d7ce937cca
2021-11-29 08:52:04 +00:00
Bill Yi
51d79ee306
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
2p: 8ab551fd7b
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I09df0851051109032b5c680c17662624d2343f59
2021-11-29 08:48:45 +00:00
Bill Yi
8ab551fd7b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I9cee529fb54682d0da69c6c39e1748cb8860d4a9
2021-11-29 08:48:32 +00:00
Bill Yi
8e754d6891
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3e347bcbdb1bda52690caa9ead4a9c913c8e990
2021-11-29 08:48:23 +00:00
Bill Yi
c6e402faa7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I45e746ac351c77ae6c6134c19dd7c778b382e945
2021-11-29 08:44:20 +00:00
Bill Yi
5a725a5b0b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4bce9132bb3c7cb7736faa4e659bbaf217a90596
2021-11-29 08:33:28 +00:00
Bonian Chen
75a5bdaa29
Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4
am: 12287b2c67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970
Change-Id: I2b908084e6422e9ccbdba8fd5cf67bf123f3ec62
2021-11-29 06:45:21 +00:00