Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,660 Commits 1 Branch 0 Tags
786f37b2c48532d4789f79b971fdee04a00a2463
Commit Graph

85660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
786f37b2c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours am: 9b1dc74d75 -s ours am: c51ddfc7ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icef4ed6fbf7de55ed324ffe2fc8ae14eda9a1bb6
 2021-05-28 03:16:00 +00:00
TreeHugger Robot
c76738885e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours am: 50eba21a6a -s ours am: 8b32f523fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb9f7d30ae043ec1551fcda25ed1c8c82375ff66
 2021-05-28 03:14:31 +00:00
Beth Thibodeau
910d1f7aa8 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405 am: baf515ee95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I300769f058b71090dee2d9581dab72c1e1332031
 2021-05-28 03:06:49 +00:00
Betty Chang
4182307ec9 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 8fdf4774b4 am: 58e10e06c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: If3f90c94cb71b306d82bf11c609fbf1cf3be31d5
 2021-05-28 03:06:35 +00:00
Kevin Chyn
5ee511cdf2 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: e6eb1020f8 am: a0adbe1918 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I9812b61f0a82038d53d8d63837c9305ac6bbec12
 2021-05-28 03:06:28 +00:00
TreeHugger Robot
2a02febbfe Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: 509a09653b am: d799e4332b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: I0e11cdd3dd74b46bcfc04d7cfa43391469aebf86
 2021-05-28 03:03:09 +00:00
Bill Yi
c51ddfc7ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours am: 9b1dc74d75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bd16588b3717d5ae30cc8b91fc5013799c9e62a
 2021-05-28 02:58:35 +00:00
TreeHugger Robot
8b32f523fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours am: 50eba21a6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5e7e5bccbc5a26aeb0f1a4f8b32794c158d7db3
 2021-05-28 02:57:18 +00:00
Beth Thibodeau
baf515ee95 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I5abe8f9c14241fd6ee339a66b3380ffcf3959a7a
 2021-05-28 02:56:16 +00:00
Betty Chang
58e10e06c3 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 8fdf4774b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: Id87b97cb260d45d606f67495c42609464d8ce5c1
 2021-05-28 02:56:06 +00:00
Kevin Chyn
a0adbe1918 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: e6eb1020f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: If9d9caeebfb36ae47b8f1836433f71b004fa5f13
 2021-05-28 02:55:59 +00:00
Bill Yi
9b1dc74d75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48bccc432fdc813a96bc2ba99ab4053861601f6a
 2021-05-28 02:53:36 +00:00
TreeHugger Robot
d799e4332b Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: 509a09653b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: Ie16aa71fa0894495fa0fa773505b4196ebc2141d
 2021-05-28 02:53:22 +00:00
TreeHugger Robot
50eba21a6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3677657d757665f0419d270d3b2be3eb2ee55b45
 2021-05-28 02:51:14 +00:00
Beth Thibodeau
b7749fd405 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I93ad28321bdc880f9fda6c6299cb1b5b60d81cfa
 2021-05-28 02:29:54 +00:00
Betty Chang
8fdf4774b4 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: Iad8e167b8f9f38b906ceb14cb9a713e8e200c354
 2021-05-28 02:29:30 +00:00
Kevin Chyn
e6eb1020f8 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I76b7fff784faa5945717c1ec3d016f7ab57d5ece
 2021-05-28 02:29:24 +00:00
TreeHugger Robot
509a09653b Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: Id714cf519433966edd608cb9f62b9d12b7e5d384
 2021-05-28 02:24:48 +00:00
TreeHugger Robot
c4882fe250 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:56:30 +00:00
Bill Yi
332a439d60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I870af03ea6bb50cc77f123ea6426039b2c6c2d9a
 2021-05-27 18:45:28 +00:00
TreeHugger Robot
4b9bf7e90c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-27 18:44:37 +00:00
TreeHugger Robot
c2bc9bfc54 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:37:28 +00:00
Beth Thibodeau
8e67634830 Merge "Add recommendation setting and remove app settings" into sc-dev 2021-05-27 16:19:17 +00:00
Betty Chang
b857491c48 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev 2021-05-27 09:04:42 +00:00
Kevin Chyn
dc00faece6 Merge "Use lottie animation for fingerprint edu" into sc-dev 2021-05-27 08:31:55 +00:00
TreeHugger Robot
029edb7c48 Merge "Update battery defender tip string" into sc-dev 2021-05-27 05:52:19 +00:00
TreeHugger Robot
e7e5e3ba4a Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 8ab420233c am: 2fb5315f95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: Ie036cb6f810c3151999e38eb160c86a54f16df20
 2021-05-27 03:03:50 +00:00
Curtis Belmonte
e71e74fffb Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: c0773fb3e6 am: a551c0eafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: If81398ef288cd937b9c3155e44487478049da056
 2021-05-27 03:03:45 +00:00
TreeHugger Robot
b0d278f22d Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 20f3744880 am: 631f2db980 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I9d19285fc67034540f51e84c4e97030e6753e7d6
 2021-05-27 03:03:38 +00:00
Curtis Belmonte
c3a2fe3ab9 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: 25b4e38015 am: 4bbe7beced 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: I0a35f5c08f89a73b440cfb7abc3f3b2adde39c76
 2021-05-27 03:03:32 +00:00
TreeHugger Robot
2fb5315f95 Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 8ab420233c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I926f2e0a08496365e9fbd5b9b6cd746947025378
 2021-05-27 02:51:35 +00:00
Curtis Belmonte
a551c0eafc Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: c0773fb3e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: If400f164069a6baf196408972eecf34e393c4ad5
 2021-05-27 02:51:30 +00:00
Yo Chiang
590b070ae8 [automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49 am: 06bf3f1993 -s ours am: bf238d463c -s ours am: df2566455c -s ours 
am skip reason: Merged-In Ib6b450489c63913c47858cf295e4785fd5d0cfbb with SHA-1 a366690de1 is already in history

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

Change-Id: I2304fa31641d71508e39ab01ba2fe4d860ee211c
 2021-05-27 02:43:32 +00:00
TreeHugger Robot
631f2db980 Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 20f3744880 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I212dd50fbae716a0a9a8604f84a4979cf19a75aa
 2021-05-27 02:42:30 +00:00
Curtis Belmonte
4bbe7beced Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: 25b4e38015 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: I713b817fa19ff9f114c7c5a6cfb7caebdd3677d4
 2021-05-27 02:42:25 +00:00
TreeHugger Robot
8ab420233c Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I012b8c511c0d1c206f437f1573f412d9053e924f
 2021-05-27 02:30:56 +00:00
Curtis Belmonte
c0773fb3e6 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: I88a4681a3595d25da25d5edb5249e52cb9282ac7
 2021-05-27 02:30:44 +00:00
TreeHugger Robot
6a91a8b49c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 469310b4b6 -s ours am: 6c387e125f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee3eddec245d7b1cd4162ee467466e3bf2b91e70
 2021-05-27 02:28:58 +00:00
TreeHugger Robot
b593cd1f4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39d86df18 -s ours am: 7dc4ae895e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id49e8af02c0ead6ca2fbfa6dff8588016ceefe9e
 2021-05-27 02:27:26 +00:00
TreeHugger Robot
20f3744880 Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I010f38bfe10c52e3b6c796a1a77d090b79169d9d
 2021-05-27 02:27:04 +00:00
TreeHugger Robot
a8e4d51c24 Merge "Remove silky flag from tests for official release" into sc-dev 2021-05-27 02:18:23 +00:00
Curtis Belmonte
25b4e38015 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: Ia9bec4a1e4d0fe47aa4232bb87c360f67f8ad560
 2021-05-27 02:15:03 +00:00
TreeHugger Robot
6c387e125f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 469310b4b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0c977e351c426c509487ac7341197d6579bc0e3
 2021-05-27 02:06:03 +00:00
TreeHugger Robot
7dc4ae895e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39d86df18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3f1123422793ed6309d3b106d0af37ccf69df6f
 2021-05-27 02:05:21 +00:00
Curtis Belmonte
2c8745b58d Merge "Fix crash due to traffic light face Lottie animation" into sc-dev 2021-05-27 01:55:58 +00:00
TreeHugger Robot
469310b4b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-05-27 01:43:27 +00:00
TreeHugger Robot
a39d86df18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-05-27 01:43:25 +00:00
Bill Yi
8f7c4549e6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0f733e69c335e78b5096e7ebc2b33d46c13d7152
 2021-05-26 23:40:18 +00:00
Bill Yi
2f6b96bbf0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7fe061ce464e7a09e10a5d928393be725bd8f0e3
 2021-05-26 23:36:20 +00:00
Bill Yi
ac8dae621e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I17b1b7d3f98301a5bae7823b6c6bfbf76af410e1
 2021-05-26 23:32:27 +00:00