Commit Graph

23661 Commits

Author SHA1 Message Date
TreeHugger Robot
1137b018f4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 19:54:30 +00:00
TreeHugger Robot
fa6415f1d2 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 5c134ad624
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ie9a94e24909310b915f81a889a9ff3e0e48c0e7b
2021-06-24 18:47:32 +00:00
TreeHugger Robot
dda37a3500 Merge "Updated fingerprint bad calibration string" into sc-dev 2021-06-24 18:12:11 +00:00
Curtis Belmonte
18e4a4b040 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: af954c7351
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I4b94541df38351e22c8517d3d57b77e9b1610f05
2021-06-24 18:07:38 +00:00
Curtis Belmonte
4de89a9361 Merge "Use correct string for Face Unlock preference category" into sc-dev 2021-06-24 17:47:14 +00:00
Bill Yi
528c9aa1a6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9f83e0ea5eb8bbfc59c1bd4c63ac9acca9a23588
2021-06-24 15:43:10 +00:00
Alex Johnston
8b903ff285 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d am: 9beb22936e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: I27b30deb374abee99555de965df59aa390a201f7
2021-06-24 13:24:42 +00:00
Alex Johnston
901617e37d Merge "Update CA certificate warning to material next spec" into sc-dev 2021-06-24 12:59:14 +00:00
TreeHugger Robot
f4e69cf26c Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d am: 68bc21c508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925

Change-Id: I08ed40a5f39dfa2ec857560115346ee4f691302c
2021-06-24 09:26:52 +00:00
TreeHugger Robot
37b1831d0d Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev 2021-06-24 08:57:58 +00:00
Arc Wang
0358562a9b Revert "Fix 'No Apps' UI issues of ManageApplications"
This reverts commit 4a97095e36.

Reason for revert: <It has abnormal scroll behavior when there is no profile tab>

Bug: 191945032
Bug: 191944934
Change-Id: Id6c71fbec4f490034bc07f6d8c9efabcb877d110
2021-06-24 08:25:44 +00:00
tim peng
c000f49a76 Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821 am: 5bafb29a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794

Change-Id: I930d976dd3fc6fdcc90dfa4f18c87db6ab1f36d0
2021-06-24 07:35:42 +00:00
tim peng
416a24d821 Merge "Sound panel doesn't match material next design for Android S" into sc-dev 2021-06-24 07:04:37 +00:00
Arc Wang
c0b7f4e903 Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f am: ec8084fe73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730

Change-Id: I2d620b08772492b8e257bbc5a4c364711969f614
2021-06-24 06:31:18 +00:00
Arc Wang
73f539ed3f Merge "Tweak UI of profile tab layout" into sc-dev 2021-06-24 05:58:10 +00:00
Arc Wang
4f1d2ebfdf Tweak UI of profile tab layout
- Change color & shape of indicator.
- Add margin around tab layout.
- Remove divider below the tab layout.

Bug: 188589806
Bug: 188589053
Test: manual visual
Change-Id: I644a4aeb951daa6eb601229fa5f1096dcbdc86ca
2021-06-24 11:15:48 +08:00
Curtis Belmonte
b1d0fb889d Merge "Fix face education UX for both grid and traffic light" into sc-dev am: 147fa2f159 am: e94db97bee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084564

Change-Id: Iae0d2059f88b3fe568a938062ccd9e93ffc93926
2021-06-24 01:27:05 +00:00
Curtis Belmonte
147fa2f159 Merge "Fix face education UX for both grid and traffic light" into sc-dev 2021-06-24 00:57:31 +00:00
TreeHugger Robot
4b8e76a6e6 Merge "Change your to the for lock prompts." into sc-dev am: c8059dc338 am: 964ef01e94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081922

Change-Id: I3142a60a466bd55a04fe69a9b29dee1d3d2bd9ca
2021-06-24 00:50:12 +00:00
Curtis Belmonte
39c9ad88f6 Use correct string for Face Unlock preference category
Updates the title of the preferences subcategory on the Face Unlock
Settings screen to use the correct string reference.

Test: Manually inspected string on Face Unlock Settings page

Bug: 191923052
Change-Id: Ia8a4a5b8f64bff8e2b764d0ecabe16099d2eba21
2021-06-23 17:37:15 -07:00
TreeHugger Robot
c8059dc338 Merge "Change your to the for lock prompts." into sc-dev 2021-06-24 00:24:26 +00:00
Menghan Li
0cc32023e5 Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: 7417f49ebd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I090f83e8ac98b9494ac8b3236624c3c5284127aa
2021-06-24 00:17:04 +00:00
Joshua Mccloskey
9a13bb445c Updated fingerprint bad calibration string
Test: Verified that the string appears during fp enrollment.
Bug: 189133688
Change-Id: I3e62788d88a29b88b7102764161be1c0f96e0e5f
2021-06-23 17:11:05 -07:00
Menghan Li
b2d7b6e5de Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev 2021-06-23 23:49:40 +00:00
Joe Bolinger
f144de8909 Change your to the for lock prompts.
Bug: 188847063
Test: N/A
Change-Id: I2c3432cc1ef12d4dc265f71a465a7ebb6df4c666
2021-06-23 16:19:00 -07:00
Curtis Belmonte
d3a07c29bf Fix face education UX for both grid and traffic light
Makes the following adjustments to the UI of the Face Unlock education
screen for both the grid and traffic light enrollment flows:
- Fixes issues with text being overlapped by illustrations
- Prevents views from moving vertically due to state changes
- Ensures no scroll is required for default locale and scaling
- Adjusts the color and content of the a11y setup toggle

Test: Manual:
1. Start grid-based face enrollment (e.g. from Settings > Security)
2. Proceed to "How to set up Face Unlock" screen
3. Tap "Setup for limited vision or head motion"
4. Toggle "Setup for limited vision or head motion" switch off and on
5. Repeat steps 1-4 for traffic light face enrollment

Fixes: 191105436
Fixes: 191317385
Change-Id: Ie80f5b3130b5b0aeceb889f53cc2dec8c7423e47
2021-06-23 16:14:40 -07:00
menghanli
880e1898fc Show one line of footer content change in Accessibility button page when the user is in gesture nav.
Bug: 190563948
Bug: 191733125
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest
Change-Id: I13ce0b3331835469d6eb9a6263a3a01f821814a8
2021-06-24 05:24:14 +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
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
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
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
Stanley Wang
13934a943a Merge "Refine the About phone page." into sc-dev am: 95f2a11593 am: 0f97f4c75c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056865

Change-Id: I8297697d666cfefbe4a5b74b9b2b31cb94a67399
2021-06-23 03:30:53 +00:00
Stanley Wang
95f2a11593 Merge "Refine the About phone page." into sc-dev 2021-06-23 03:00:19 +00:00
Matt Pietal
b854d06a08 Merge "Restore lockdown setting" into sc-dev am: c07d6ba8ee am: 0f45813339
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065627

Change-Id: I9a0717fcbe2fc1fd36b7c94a1bec3bcf4bae68f6
2021-06-22 17:02:11 +00:00
Arc Wang
a40924f815 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: a3ca0a08d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I5a053d3500b6789a995ed004ce3896ebc80f0fa1
2021-06-22 17:01:47 +00:00
Matt Pietal
c07d6ba8ee Merge "Restore lockdown setting" into sc-dev 2021-06-22 16:41:44 +00:00
Arc Wang
b0e55afc95 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev 2021-06-22 16:25:13 +00:00
Matt Pietal
7cfd8e3cec Restore lockdown setting
This was removed in error while adding wallet/controls options in
ag/14353975

Bug: 190800943
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: Id73a584d7016cf1e649dcbceeba4e81aaa2370cc
2021-06-22 10:56:20 -04:00
Stanley Wang
0c5bc76208 Refine the About phone page.
- Add the following categories
  Basic info
  Legal & regulatory
  Device details
  Device identifiers
- Remove the dividers

Fix: 179649869
Test: robotest and see the UI
Change-Id: Iecd49442cff164eb73f65f6b41fb18af9cadf8a4
2021-06-22 16:35:52 +08:00
Arc Wang
4a97095e36 Fix 'No Apps' UI issues of ManageApplications
Fixes below UI issues

- "No Apps" may not show in fragments of profile tab.

  Fix it by using ConstraintLayout to specify alignments
  of each view and removing extra padding.

-- "No Apps" may flicker by moving position.

  The flicker is from unnecessary visibility changes.
  This change integrates empty view visibility
  control in LoadingViewController to simplify code
  and avoid unnecessary visibility changes.

Bug: 189390795
Bug: 183398721
Test: atest com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      Manual visual, observe UI
        Settings -> Storage -> Games
        Settings -> Notifications -> App Settings
	Settings > Apps > Special app access > Media management apps
Change-Id: I9a2500f2fd1dd073ab88f26187541964719523d0
2021-06-22 11:04:24 +08:00
Mill Chen
546dd8724d Suppress the action bar in SetupChooseLockGeneric
The collapsing toolbar is introduced on S, which caused the Choose a
screen lock page has two different header. This CL is to supress the
collapsing toolbar from this page and also apply color extraction to the
page.

Bug: 190499041
Test: manual test
Make sure there's no collapsing toolbar in the page.

Change-Id: I8b7ea089bd9e9e7acdf0236099b1eb6270f0a816
2021-06-22 08:10:30 +08:00
Joshua Mccloskey
5fe9ace936 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 am: 306642fc38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: I59a11fe53492c096c5aaf59157f48f8bc44551a9
2021-06-21 21:03:09 +00:00
Joshua Mccloskey
be845d1541 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev 2021-06-21 20:41:01 +00:00
TreeHugger Robot
ab43a110b7 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: 05e21445b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: I47e61f79a6f76a979ab04e6048eabb051f280de8
2021-06-21 20:16:44 +00:00
Joe Bolinger
e0996aaada Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: 69291542a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: Ic4aeffad3ac3608d3666328838c23bfe71736233
2021-06-21 20:12:15 +00:00
TreeHugger Robot
65220e5cdb Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev 2021-06-21 18:46:23 +00:00
Joe Bolinger
daeda0525b Merge changes from topic "unicorn-hand" into sc-dev
* changes:
  Add new enum for parental consent UI.
  Add handoff activity to parental consent flow.
2021-06-21 17:06:29 +00:00