Commit Graph

23692 Commits

Author SHA1 Message Date
TreeHugger Robot
d1586a2619 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 6fbeadac34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: Iec6c485a15e053678d96b41c35ff8094289fc936
2021-06-28 04:47:38 +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
97c231244f Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: d7a57a59d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: Ib871f554cc325dbbfa87a6005bd28cbc0dac0187
2021-06-28 04:12:38 +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
a914f1f256 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-26 05:05:21 +00:00
TreeHugger Robot
1a059ed14e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-26 04:59:40 +00:00
TreeHugger Robot
edea8a6799 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 04:58:47 +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
d5122c99da Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I681bb40cd81659cd790720d325eca43e2f7fa0df
2021-06-26 03:29:07 +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
Bill Yi
099228835a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a64c001578a58dd1ca7d67c7208a2b68277e3c6
2021-06-26 03:22:09 +00:00
Joshua Mccloskey
88d7246a45 Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde am: 825141c44f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972

Change-Id: I5819cc355975cf17fa9d475c331ce261e2757021
2021-06-25 22:56:58 +00:00
Joshua Mccloskey
477c5d9cde Merge "Updated fp bad calibration string" into sc-dev 2021-06-25 22:37:01 +00:00
Curtis Belmonte
47685ca834 Update strings for choose lock password/pattern screen am: 4aa1e532db am: ff05ace156
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893

Change-Id: Id192ac7542d144af908ce8bd070a33e0e419fd54
2021-06-25 22:36:36 +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
a70c21373f Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a am: 0eebaf719e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781

Change-Id: I24f18d35110a9ec0748addc5fde327f7aaf2fc2e
2021-06-25 08:49:04 +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
0470dba81f Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1 am: 8c857823e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868

Change-Id: I8508f70b53461be91e9c96c3a59c1988d889c715
2021-06-25 03:47:23 +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
86bde2c213 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 21:33:01 +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
1137b018f4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 19:54:30 +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
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
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
528c9aa1a6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9f83e0ea5eb8bbfc59c1bd4c63ac9acca9a23588
2021-06-24 15:43:10 +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
Bill Yi
cbf8a083b8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7408d1f2ed2c27f923bda14daa93a2d4ce504310
2021-06-24 15:36:26 +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
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
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