Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,018 Commits 1 Branch 0 Tags
6a2c48a77ffa716eb825f14363209300a571bed6
Commit Graph

23672 Commits

Author SHA1 Message Date
Erik Wolsheimer
93cc3ea981 Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 7fa9100f4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: Ic831cade470554be06698da2b7de3a0466b12d81
 2021-06-28 21:03:37 +00: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
3110021f51 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: I14c08d87c5895a6962142a226d52f3ed6fbf7b84
 2021-06-28 04:37:57 +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
659eb02d2d 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: Iadf3b86d87e11e481f5ea7161c5e8c3ab6b0f2bb
 2021-06-28 03:56:15 +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
0d9161fd98 Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972

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

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

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

Change-Id: I4f1a59ca2ad058f590505ab878906a94a6e99599
 2021-06-25 03:30:22 +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
6916b17c04 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

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

Change-Id: I915e1b3e6623a30fb3fd9be75bccdb5c13c359a9
 2021-06-24 17:58:07 +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
6cbce0e954 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: I9711a05481efbc6b4d03d0247e2e753b9efedecc
 2021-06-24 13:11:43 +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
bdef27388c Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925

Change-Id: Ib658145239a3d76df3b4461c0852121604f1ccc9
 2021-06-24 09:09:13 +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