Bill Yi
07b6b22b7a
[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: I7eaed9d5f4c10a19718742379707602e91d53c04
2021-05-27 19:19:49 +00:00
TreeHugger Robot
4d604cdfbf
[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: Id0bbcd3c00753fdec2c0f2f8d17609d9c13f7c54
2021-05-27 19:19:21 +00:00
Bill Yi
b257c75f38
[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: I1a6d656f1b1af810e90e3cbc3bce8069fa1beb18
2021-05-27 19:17:13 +00:00
TreeHugger Robot
123386039b
[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: Icd519f0790fdba3cc121ef9eb0cd545b1e2a1a51
2021-05-27 19:01:39 +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
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
ff3fc65ac3
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: Iac3b73e216ea6ee51686f44a8174931151c9f23f
2021-05-27 16:53:04 +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
4a42b08b79
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: If535ab5d56c2e043aed24d55f96fc4cb60a66fbb
2021-05-27 09:15:16 +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
c00c3bdd03
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: Ic8ae2e857a85e06eee745588a8fb66c2902b1c63
2021-05-27 09:03:08 +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
a25ffb5ba9
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: Ib065339af0983ac5116defeb648d5a9024d11dec
2021-05-27 06:12:45 +00:00
TreeHugger Robot
029edb7c48
Merge "Update battery defender tip string" into sc-dev
2021-05-27 05:52:19 +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
a8e4d51c24
Merge "Remove silky flag from tests for official release" into sc-dev
2021-05-27 02:18:23 +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
cca1f1ad74
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d9e586cede3c387509ff758a681ebb9aef0c8d9
2021-05-26 23:28:54 +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
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
fcbf881fc2
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: I14cafe3cfd4d5c4a3996e58ff6844192877f02eb
2021-05-26 18:51:26 +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
4a7132d851
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: I61ec5956d6f72249213c6cbfe30798df82c09dc4
2021-05-26 17:44:55 +00:00
Abel Tesfaye
ac08b132bf
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: I76971481cdae4b39d579934952a758aa449b771f
2021-05-26 17:44:00 +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
4c18ba65c6
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: I577bdade1ca658952fb98331d2d739e41c021e60
2021-05-26 17:06:47 +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
749cc2afb9
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: I522ccb00abbd553af6813486e5ee3e5d07f4d849
2021-05-26 12:54:51 +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
cf2a7810f3
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: I30c4ccacba4ccc032535f0a159be8d9e297d04d0
2021-05-26 12:05:37 +00:00
Weng Su
802b9acbe2
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: I16495e1a1171ae3a3a78ede194d2ded92057e76d
2021-05-26 12:05:30 +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
cd82b94eff
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: Ib9ce328500c32c9e10a31c6e0a7fa0a6aa7e49c0
2021-05-26 10:46:19 +00:00