PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,229 Commits 1 Branch 0 Tags
a6a4e0939e0f56a9b2d129508dd0f770e3f1875c
Commit Graph

83229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a6a4e0939e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours am: c6e8fc4459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4189b04372c5b3a4c1a5f882db78f14ad8c80ed
 2021-05-28 16:32:24 +00:00
Bill Yi
7a08002165 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours am: 3f0263ce7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a6fad8e2d9027482a517a348dcdae20e4de3765
 2021-05-28 16:32:07 +00:00
TreeHugger Robot
cf02a643e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours am: 197a03a9de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icea6fe560093aa06a411524730ac278143e2d4d3
 2021-05-28 16:31:38 +00:00
Bill Yi
575c55a744 [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: I4af0e3978d198a03dab51494cff4409c478140cf
 2021-05-28 16:21:43 +00:00
TreeHugger Robot
950e0c6bdc [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: I695059a6567b61463a0d3027a344e057aa76d9b9
 2021-05-28 16:17:12 +00:00
Beth Thibodeau
346bb99241 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: Ib4fe1fb9081b4c5c6a6737be0d99dd11a30baa91
 2021-05-28 16:03:35 +00:00
Betty Chang
aafa492c16 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: I0e4caf8a841c93d12ef6b99bc3cd8dc91b62fcc7
 2021-05-28 16:03:24 +00:00
Kevin Chyn
550a673f96 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: I1ab4ebf2af8976db9c049815e8f991c18bc051a4
 2021-05-28 16:03:18 +00:00
TreeHugger Robot
ed3146ce9e 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: I77dfa932c5fe32fe9fd5d1bd985d3be393b93aa7
 2021-05-28 15:59:28 +00:00
TreeHugger Robot
c6e8fc4459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia552b51f6ce6e5c5cc0a7235638b3a1af8d1b406
 2021-05-27 19:01:35 +00:00
Bill Yi
3f0263ce7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77480c4c38b35835e2b7ceff07e070e31150eaa7
 2021-05-27 19:01:11 +00:00
TreeHugger Robot
695cdae2f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-27 18:48:17 +00:00
TreeHugger Robot
197a03a9de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9540649bb2977b9324dc81069cfcb8026a5a70d8
 2021-05-27 18:45:37 +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
660d37d895 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-27 18:21:27 +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
4876a9425f 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: Ic29b807e19c14284e241b573ad4a2fde4bbd8b32
 2021-05-27 02:27:16 +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
05c3b6479d 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: If63cb21eb6f5276d97996c0b7a588480f143e611
 2021-05-27 02:15:15 +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
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
186570767c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia41b67be42cb2f033d3860f3c3192506bcca4e83
 2021-05-26 23:22:59 +00:00
Bill Yi
f8a2c62f84 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2948411834089541f69de7ce2d4f1efa9a06c9b6
 2021-05-26 23:19:33 +00:00
Bill Yi
9a44ce2abe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4ceb03127a48ec7405f24bcdde2cd3a8114fcea1
 2021-05-26 23:16:39 +00:00
Bill Yi
a886dcf23a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib0d8a1473ca1725a868d640a7b4f067b8aff0777
 2021-05-26 23:13:11 +00:00
Curtis Belmonte
adf0cabe0a Fix crash due to traffic light face Lottie animation 
Load the animation asset only if enabled in the resource config, to
avoid crashing on unsupported device configurations.

Test: Manual

Fixes: 189290180
Change-Id: Iae46c735277777705c1d6f4595b557e4b0b1aef7
 2021-05-26 16:11:56 -07:00
Kevin Chyn
1bad80b36b Use lottie animation for fingerprint edu 
The landscape layout can be removed now, since for UDFPS,
we do not use this page for the "find sensor" functionality anymore.
Instead, we show the edu animation.

Bug: 187460696
Test: manual

Change-Id: Ic2e15ecf73c42b8a0cea4ea8996b1b7dd2f3b4f2
 2021-05-26 14:49:51 -07:00
Yanting Yang
098a17ccb2 Remove silky flag from tests for official release 
Bug: 183670633
Test: robotests
Change-Id: Ie78a35cfc73632dcb638b78e952a1093926763bb
 2021-05-27 03:05:55 +08:00
TreeHugger Robot
b5f586fbd4 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: I78269f4d650cda6b9915d9770976d7d42ae28e10
 2021-05-26 18:49:48 +00:00
TreeHugger Robot
1e747a593f Merge "Rounded ripple notification history snoozed list" into sc-dev 2021-05-26 18:33:23 +00:00
Peter Wang
f75178c3da Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I970d50e0ec513d509623714fa78cfdc74c8e41bd
 2021-05-26 17:42:52 +00:00
Abel Tesfaye
e07f2977c6 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: I5f3f0516bc25131ff9b0977d77be728adee22d2c
 2021-05-26 17:42:21 +00:00
Peter Wang
b66e797567 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev 2021-05-26 17:37:04 +00:00
Abel Tesfaye
3b3187b313 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev 2021-05-26 17:26:31 +00:00
Rajeev Kumar
b4080f53b2 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079

Change-Id: Iff2b99e0c0c814f86d57c2fd3b3238f4e5dd1ac2
 2021-05-26 17:05:15 +00:00
Rajeev Kumar
265dd55235 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev 2021-05-26 16:46:58 +00:00
Jay Aliomer
225607b6eb Rounded ripple notification history snoozed list 
currently the ripple has sharpe edges and outside the view bounds

Fixes: b/187868531
Test: Visual
Change-Id: Iedacc6b875fa3bc4319d5e81034777dd873f7e26
 2021-05-26 11:55:56 -04:00
Beth Thibodeau
b7993699ba Add recommendation setting and remove app settings 
- Add a new setting to control whether smartspace recommendations are
enabled
- Remove setting to block individual apps from resumption
- Update strings for existing resume setting

Bug: 187925818
Test: atest SettingsProviderTest
Test: atest MediaControlsRecommendationControllerTest
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I4bd6a420e01e8c44f4db8be477557501648cc8d7
 2021-05-26 11:00:25 -04:00
TreeHugger Robot
53380de2b7 Merge "Fix connected devices settings jank issue" into sc-dev am: 8cb761e3d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702395

Change-Id: I190485fad8b70958a7ff13859083e3b27a7bd152
 2021-05-26 12:53:15 +00:00
TreeHugger Robot
8cb761e3d7 Merge "Fix connected devices settings jank issue" into sc-dev 2021-05-26 12:36:44 +00:00
Weng Su
8817016052 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195

Change-Id: I1f97dae0b10628627e22f65e64f1f40cd3167ce4
 2021-05-26 12:03:57 +00:00
Weng Su
ceae441ee0 Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752

Change-Id: I0cde659d3eb6fcba9d8a03bcf98755c7b6783168
 2021-05-26 12:03:49 +00:00
Weng Su
9512d53697 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev 2021-05-26 11:45:00 +00:00
Weng Su
a2084a63c6 [Provider model] Add "See all" text link to Internet Panel 
- Add "See all" text link at the bottom of the network providers list
  - Don't show "See all" text link if the Wi-Fi network is empty

Bug: 188710392
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: If99c1e6597b4d2ef6a916fbdab3df9cfad8b464e
 2021-05-26 11:44:09 +00:00
Weng Su
59f7b677fe Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev 2021-05-26 11:43:49 +00:00
TreeHugger Robot
8130ce29d8 Merge "Simplify the transition logic." into sc-dev am: 5b24943b06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: I6b5a9baded2c249f7210cffd70a79bc2858fe864
 2021-05-26 10:54:17 +00:00