Commit Graph

23397 Commits

Author SHA1 Message Date
Curtis Belmonte
0d0a045bad Adjust layout of the face education Lottie animation am: d8c142b44a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: Ieaa753a52bfae3b43938f72a462b4a11316d7c8e
2021-06-28 23:51:03 +00:00
Curtis Belmonte
d8c142b44a Adjust layout of the face education Lottie animation
Updates the size and position of the face enroll education Lottie
animation to support the latest version.

Test: Manual

Bug: 181373277
Change-Id: Ieccd3fa839f3ef329ed732a8b8623baf236c31ad
2021-06-28 15:37:34 -07:00
Erik Wolsheimer
7fa9100f4a Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: I9e78359c2613542dbf3a025c2e1337c214cd261e
2021-06-28 20:52:41 +00:00
Erik Wolsheimer
89af43a4ab Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev 2021-06-28 20:39:21 +00:00
Erik Wolsheimer
13564b83dd Do not refer to 'default' in default_print_service_main_switch_title
Bug: 192270303
Test: Manual
Change-Id: I9fd64f321ca259249b55e17b0ea8fff5ff6fe27f
2021-06-28 12:24:01 -07:00
TreeHugger Robot
f7c714547f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-28 19:20:17 +00:00
Bill Yi
1d5f64b1e1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ed7b2ca9c085acb83d74f01fd82d1de4d5f89ac
2021-06-28 17:52:23 +00:00
Bill Yi
1b154d8247 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If00a7fee9c649efa3c49973c7f8465b94bb24299
2021-06-28 17:48:37 +00:00
TreeHugger Robot
b664b7f0c0 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I9f35f48be860d3513e64d724a98f6e01d7282331
2021-06-28 04:39:32 +00:00
TreeHugger Robot
3d5fd19e9f Merge "Consistent color between status bar and app bar" into sc-dev 2021-06-28 04:25:09 +00:00
Arc Wang
14920afb08 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: Iac6365f7e239d3d5472807e82de49526e48aeb52
2021-06-28 03:57:57 +00:00
Arc Wang
3625cf50aa Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev 2021-06-28 03:43:59 +00:00
Arc Wang
465560d388 Shows ripple effect inside CardPreference's rounded rectangle
contextual_card_background is a drawable which shows ripple.
Sets contextual_card_background as the foreground of
MaterialCardView.

Bug: 191617809
Test: manual visual
Change-Id: I09ee886fe56e443626042682381560ed0f32d51d
2021-06-27 15:59:18 +00:00
TreeHugger Robot
1060b2f926 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 05:16:50 +00:00
TreeHugger Robot
edea8a6799 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 04:58:47 +00:00
TreeHugger Robot
82c7e98261 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-26 04:50:27 +00:00
TreeHugger Robot
347666014d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-26 04:49:47 +00:00
Bill Yi
0ea1d883ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9e0efc01f382094d5ce4884963635557e4be1370
2021-06-26 03:38:06 +00:00
Bill Yi
3d56d7be5c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1be53c98eb342d9fa588e3c953bf34cd9d12ba75
2021-06-26 03:33:56 +00:00
Bill Yi
60c0a41746 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I81ad12d0a40b94a0526b57b78da36829cbe722e9
2021-06-26 03:25:20 +00:00
Bill Yi
9f28edb782 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1fcdc5845232e672d3eb3a28aaf1c094886a3f09
2021-06-26 03:23:44 +00:00
Joshua Mccloskey
477c5d9cde Merge "Updated fp bad calibration string" into sc-dev 2021-06-25 22:37:01 +00:00
Curtis Belmonte
4aa1e532db Update strings for choose lock password/pattern screen
Makes the following changes to the header/description text shown on the
choose lock screen:
- Remove references to "biometrics" in favor of "face or fingerprint"
- Add a default description when setting a PIN/pattern/password

Test: Manual

Bug: 191923052
Change-Id: I788fd03aaeea624fab548d1c055c5c6dee076e2d
2021-06-25 12:59:47 -07:00
Joshua Mccloskey
05689a3432 Updated fp bad calibration string
Test: Verified string was present during enrollment error.
Bug: 189133688
Change-Id: Ia9a447c443fa0784c736e171a2e1840fed55034c
2021-06-25 18:32:19 +00:00
Zimuzo Ezeozue
17608ff21a Merge "Update string to enable transcode via MTP" into sc-dev 2021-06-25 08:24:27 +00:00
Wendy Sung
29da5abcb1 Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev 2021-06-25 03:22:41 +00:00
TreeHugger Robot
54c1ff8489 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 20:25:56 +00:00
TreeHugger Robot
edeef947e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 19:56:59 +00:00
TreeHugger Robot
ca62b8d0aa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:51:09 +00:00
TreeHugger Robot
f0708e90f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:48:40 +00:00
Zim
6699b47f77 Update string to enable transcode via MTP
Also added a summary string when checked.

Test: Manual
Bug: 191985287
Change-Id: I1db9763bbf3766eecace6eca168218ab71ca6195
2021-06-24 20:13:08 +01:00
TreeHugger Robot
dda37a3500 Merge "Updated fingerprint bad calibration string" into sc-dev 2021-06-24 18:12:11 +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
ae7989d729 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic0b8647c8319e2389b3e8bf0bf90edcfc9935d25
2021-06-24 15:51:28 +00:00
Bill Yi
e93a98e06b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95f8f317ddf4f40de75a9d7171960ca430dc0cd9
2021-06-24 15:47:17 +00:00
Bill Yi
d1c25e8dfe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I62eace4a91508f8f27ab37d4cb9a464ba6417f4c
2021-06-24 15:39:29 +00:00
Bill Yi
a83bc881f6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib99ff0cca771e011eb4c7c01e741b47a6ff57724
2021-06-24 15:37:57 +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
37b1831d0d Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev 2021-06-24 08:57:58 +00:00
Wendy Sung
666178a0dc Add Adaptive Preferences Lottie File for Dark Mode
Test: make Settings
Bug: 178199757
Change-Id: I22751a4ea3c25a252c641871f1b1249f6ff92bcc
2021-06-24 08:47:20 +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
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
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
147fa2f159 Merge "Fix face education UX for both grid and traffic light" into sc-dev 2021-06-24 00:57:31 +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
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