Commit Graph

85733 Commits

Author SHA1 Message Date
Jason Chiu
11d3b19c51 Fix the highlight error after unfolding the device
Unfolding a device generates mutiple lifecycle events and resets the
highlight key.

Check if there's only one activity in the task and then perform the
reset.

Fix: 209016927
Test: manual
Change-Id: I49988fa913270d35a04436777433b7669afb72df
2021-12-10 22:37:22 +08:00
Jason Chiu
bd8f45b9d4 Fix the onCreate crash happened among zen mode rule pages
Fix: 199229588
Test: manual
Change-Id: I7b0116de8d9760f420c026a8d65b019e6d2d00df
2021-12-10 11:36:55 +08:00
Tsung-Mao Fang
c496858824 Merge "Turn off deep link components by default" into sc-v2-dev 2021-12-10 03:30:19 +00:00
TreeHugger Robot
0f0e27cf6a Merge "Move the text under slider bar to the description under title" into sc-v2-dev 2021-12-10 01:03:24 +00:00
Joe Bolinger
493e889dd6 Update remove face enrollment strings for convenience.
Fix: 209877102
Test: manual (enroll & delete)
Change-Id: Idb3a8d3622574edc47673e8fe6a72a5b9d449c7b
2021-12-09 19:24:27 +00:00
Joe Bolinger
e8d9c1e1d3 Merge "Update enrollment edu animation." into sc-v2-dev 2021-12-09 18:09:34 +00:00
Tom Hsu
c51a58d819 Merge "[Provider Model] fix incorrect signal icon on internet picker" into sc-v2-dev 2021-12-09 16:11:13 +00:00
tom hsu
90274b2033 [Provider Model] fix incorrect signal icon on internet picker
- Modify incorrect sub id to TelephonyManager

Bug: 204411539
Test: b/204411539#17
Change-Id: I7453267a1cd6158f03aa9b94f780fc2faa06d990
2021-12-09 15:03:10 +00:00
TreeHugger Robot
46655e62ef Merge "Set the package name to the deep link intent" into sc-v2-dev 2021-12-09 15:01:26 +00:00
SongFerng Wang
c350919fa4 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev 2021-12-09 14:24:43 +00:00
Bonian Chen
11271df53a [Settings] Support phone number talkback
Support phone number talkback in about phone UI pages.

Bug: 182923869
Test: local, junit
Change-Id: I159827070a954dee13230ff7cf6de81dbbaa7545
(cherry picked from commit d051e65d3c)
2021-12-09 13:45:40 +00:00
TreeHugger Robot
6dbc3835f8 Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev 2021-12-09 13:09:31 +00:00
Jason Hsu
dc0ee218e9 Merge "Add new string to hint user of triple-tap shortcut delay" into sc-v2-dev 2021-12-09 13:03:12 +00:00
Alex Johnston
a418a3add2 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours am: 179d757227 -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I8f067f8e33a35eb03fb1fd15fcb631d7c0faf923
2021-12-09 12:52:25 +00:00
Alex Johnston
2e2c6def05 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours am: 8d273f425e -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I3d9ce05df1c0a3a596c46dce3f1f5fc839a263ba
2021-12-09 12:52:20 +00:00
Alex Johnston
179d757227 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours am: edb4843063 -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I2768955dccdde79767163ba69565f67a9646e8e9
2021-12-09 12:37:18 +00:00
Alex Johnston
8d273f425e [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours am: a849920dce -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I1c7f2a199b03858a67d999060a57b14fbe4c5dfb
2021-12-09 12:37:12 +00:00
Bonian Chen
5fa5323d3b [Settings] Fix failure test case
Fix test case in Robolectric.

Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
(cherry picked from commit c4e09e6950)
2021-12-09 12:26:52 +00:00
Alex Johnston
ab28d070b4 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67 am: c745bc427e -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 2f193c8157 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: I151c19730fffe923ad1be87430c43301dad46ebc
2021-12-09 12:21:28 +00:00
Alex Johnston
edb4843063 [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 6f8ba573a8 -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I57cd5f04f66b1874bf1d1e1c164eba7789af9ad8
2021-12-09 12:21:13 +00:00
Alex Johnston
a849920dce [automerger skipped] Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748 am: 88b7d05d76 -s ours
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 02e8f56e67 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: Ia158b48a9af8910eff034da0847b1d43aa2dc3a7
2021-12-09 12:19:33 +00:00
Alex Johnston
c745bc427e Add non system overlay flag to InstallCaCertificateWarning am: 02e8f56e67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16414971

Change-Id: Ib4a03feff7c118afaeae5553f94d9915881c2e4e
2021-12-09 12:05:20 +00:00
Alex Johnston
6f8ba573a8 Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I1a2d3a106cfedb8cb43b2eae446e1de9efef955c
2021-12-09 12:04:49 +00:00
Alex Johnston
88b7d05d76 Add non system overlay flag to InstallCaCertificateWarning am: fca5cb3748
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16405873

Change-Id: I6b616fa81ce4c5c53e553f8e692fdc059bb894fe
2021-12-09 12:03:22 +00:00
ykhung
b3f3f3d4f2 Remove the replaced activity checking to impact launching performance
Bug: 209081502
Test: make SettingsRoboTests
Change-Id: Id8e2144a5965601be9c290bc4df6db0d0beb0917
Merged-In: Id8e2144a5965601be9c290bc4df6db0d0beb0917
2021-12-09 11:51:11 +00:00
Alex Li
b1a91c9f95 Merge "[Settings] Remove override the transition to fade during the Suw flow." into sc-v2-dev 2021-12-09 10:43:56 +00:00
Jason Chiu
209df88d9d Set the package name to the deep link intent
If a deep link intent is not specified a package name, the intent action
will be resolved to ForwardIntentToParent in some cases.

Fix: 209928944
Test: manual
Change-Id: I502be6be550ba817b4337f2d0793a7b3678fc8d2
2021-12-09 10:20:34 +00:00
jasonwshsu
dc156e77b4 Add new string to hint user of triple-tap shortcut delay
* Original content in magnification switch shortcut dialog needs to have
different versions for different accessibility software shortcuts. Use
this generic content to replace them.

Bug: 208749782
Test: manual test
Change-Id: Ifc6591625c92ea04f6637ecfe90ce7d7b528b295
2021-12-09 10:00:58 +00:00
Sunny Shao
b5bb0e85a1 Move the text under slider bar to the description under title
- Make this change after discussed with UX team.

Fixes: 206737771
Test: manual test
Change-Id: I9517933312d8db400f6d40b4124815ad275014ec
2021-12-09 17:13:26 +08:00
Jason Chiu
e06fb6348a Merge "Fix the highlight error and remove the empty card" into sc-v2-dev 2021-12-09 08:59:23 +00:00
Jason Chiu
8c559c2788 Fix the highlight error and remove the empty card
Fix: 209918251
Test: manual
Change-Id: I2a5afceea18cd4e1009114091433a2da22ac105e
2021-12-09 15:09:09 +08:00
Tsung-Mao Fang
e386d498d6 Merge "Revert "Device do network scan after user rotates NetworkSelection page"" into sc-v2-dev 2021-12-09 05:53:33 +00:00
Tsung-Mao Fang
3943de1579 Turn off deep link components by default
We should only enable necessary components when
device supports the split activity feature.

Test: Enable/Disable components and make sure things work well.
Bug: 204405245
Change-Id: Icb03e121eed0e584bebe1c9c838d0f4f44015abf
2021-12-09 11:54:22 +08:00
Jason Chiu
5377da37f1 Merge "Do not show the redundant RemoveAccountFailureDialog" into sc-v2-dev 2021-12-09 02:40:05 +00:00
Alex Johnston
fca5cb3748 Add non system overlay flag to InstallCaCertificateWarning
Bug: 196969991
Test: Manual testing with Settings
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157)
2021-12-08 21:18:30 +00:00
Alex Johnston
02e8f56e67 Add non system overlay flag to InstallCaCertificateWarning
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157)
2021-12-08 21:18:03 +00:00
Tsung-Mao Fang
f848cd8156 Revert "Device do network scan after user rotates NetworkSelection page"
This reverts commit 13aadad7fa.

Reason for revert: b/207587612

Change-Id: I8bef41eb43088d4a118de30eab0ac3ddc6c7c79c
2021-12-08 14:19:33 +00:00
Alex Johnston
04c66a0a3c Add non system overlay flag to RequestManageCredentials
Bug: 205150380
Test: Manual testing with Settings and TestDPC
Change-Id: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
2021-12-08 11:08:44 +00:00
alexylli
2a7069f561 [Settings] Remove override the transition to fade during the Suw flow.
Because Suw side has already override the transition when calling the
font size.

video: https://drive.google.com/file/d/1Lihpj3PFX4-xpg1d3pT3pBqm99noQL-k/view?usp=sharing

Bug: 208374725
Test: manual
Change-Id: Idaa56cdbdc7b9f76fe370ba79130007f7359557c
2021-12-08 17:06:44 +08:00
Joshua Mccloskey
af87b942f6 Merge "Added sensorPrivacyDialog to face settings" into sc-v2-dev 2021-12-08 07:01:57 +00:00
Jason Chiu
e5f1d24913 Do not show the redundant RemoveAccountFailureDialog
When the AccountManager's confirm remove dialog is canceled, a redundant
ConfirmRemoveAccountDialog showed up.

- Only show the dialog when a real error reported from AccountManager
- Also change RemoveAccountFailureDialog's title to remove the redundant
  question mark

Fix: 204948166
Test: manual
Change-Id: If712e120938e80e1bf4593fa78a1a2a70684fc2a
2021-12-08 06:29:19 +00:00
Lucas Dupin
f6354d8af7 Merge "[Settings] Expose Bluetooth Pairing settings page" into sc-v2-dev 2021-12-07 17:44:25 +00:00
Betty Chang
a22e367fca Merge "To get Display name by active subscription info" into sc-v2-dev 2021-12-07 05:41:11 +00:00
shaoweishen
1b58ba5df2 [Settings] Expose Bluetooth Pairing settings page
Bug: 204405245
Test: N/A
Change-Id: Iac85dcb76b674aa4e6afe21d9ef149d091531888
2021-12-06 12:07:08 +00:00
Bonian Chen
8c0052d537 [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
2021-12-06 09:54:00 +00:00
Bonian Chen
dddd74a491 [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
2021-12-06 09:50:45 +00:00
Bonian Chen
5fc0e6614d [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
2021-12-06 09:48:50 +00:00
Bonian Chen
5935cae639 [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
2021-12-06 09:46:38 +00:00
Bonian Chen
96f581310f [Settings] Move display of VPN version into summary text
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: install apk from b/205460459#comment3 and verify
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275
2021-12-06 09:43:22 +00:00
TreeHugger Robot
b5687c464a Merge "Improve the cold start performance" into sc-v2-dev 2021-12-06 09:05:04 +00:00