Commit Graph

84893 Commits

Author SHA1 Message Date
Bill Yi
24dabad62e Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: Ic3ded16601c92a03262dd117d7e6eed2d002eecb
2021-09-20 13:28:48 +00:00
Bill Yi
39f5c07a46 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 6c50635319 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddace0681dfb896a08d5f4180f79371d4b5ceaaf
2021-09-20 13:28:47 +00:00
Bill Yi
7159a65e51 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 15c729b335 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49a5b608f3c33a6aa74a95d39bcf674cafbfc6c7
2021-09-20 13:28:37 +00:00
Bill Yi
6bff29a287 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00
TreeHugger Robot
59657f177e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0cf70cd38b40f5ff2a3cbec48ee1dde252628b6c
2021-09-20 06:34:10 +00:00
Bill Yi
a5e8168fba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I393b0d96d51a639aa387212c41c69a7a1d39dac9
2021-09-20 06:33:49 +00:00
TreeHugger Robot
e9200b19ad Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-20 06:19:10 +00:00
Bill Yi
62814d9f22 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6b0a170a252a9de2623da7a47afc456806c8b491
2021-09-18 17:24:49 +00:00
Bill Yi
15c729b335 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
Blank merge reason: commit message contains skip directive

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

Change-Id: I1e2d0d4f545ec2d4bf09ae29ecbd96baae53a432
2021-09-18 17:21:27 +00:00
Bill Yi
47ea4adaed Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac26620cda40d2696577626befff4c5d811d35b7
2021-09-18 17:21:13 +00:00
Bill Yi
918492ab2a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5565d21fd52770ff7a0a72e0eee23373b5bbb9cd
2021-09-18 17:12:15 +00:00
Bill Yi
6c50635319 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Blank merge reason: commit message contains skip directive

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

Change-Id: If6b26166c7bc75f1879cd1cb5c34641732aa7a2e
2021-09-18 17:10:55 +00:00
Bill Yi
cc5e2f9643 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1b3e386baf72d68cdbb895055f61ed1f54817389
2021-09-18 17:10:42 +00:00
TreeHugger Robot
b96d734511 Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400

Change-Id: Id787a8b926cb5efdbdba91186135b5fd28fda743
2021-09-17 13:41:36 +00:00
TreeHugger Robot
2e16b4a07d Merge "Shrink notification history views to fit" into sc-qpr1-dev 2021-09-17 13:28:25 +00:00
Calvin Pan
6e51289e9b Merge "Disable smart forwarding based on subid" into sc-qpr1-dev am: 216315523b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15819074

Change-Id: I4a63d92bfef99f531855a0a9d82687cb20739121
2021-09-17 01:47:55 +00:00
Calvin Pan
216315523b Merge "Disable smart forwarding based on subid" into sc-qpr1-dev 2021-09-17 01:33:05 +00:00
Julia Reynolds
faa7083c8b Shrink notification history views to fit
If an app hasn't posted many notifications, don't show extra whitespace
after its notifications

Test: manual, look at apps that have posted 1-3 notifications, and 10+
Fixes: 199944158
Change-Id: I8ed3e25cd35956eae9ce2fc5677710a34200bdfc
2021-09-16 21:01:43 +00:00
Bonian Chen
fdab21bafa Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev am: ebe477db21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824485

Change-Id: I8971849aaee92125a7590dee4c20bdc5e09619d5
2021-09-16 19:25:51 +00:00
Bonian Chen
b8c59b803f Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM" into sc-qpr1-dev am: 213c9ca658
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15838828

Change-Id: I3c4d842e9847867c09f8644a749c7d4c11eda21e
2021-09-16 19:25:21 +00:00
Bonian Chen
ebe477db21 Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev 2021-09-16 19:08:47 +00:00
Bonian Chen
213c9ca658 Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM" into sc-qpr1-dev 2021-09-16 19:08:09 +00:00
TreeHugger Robot
d093ffa25d Merge "Fix hold volume keys don't trigger the one handed mode in One-handed mode settings page" into sc-qpr1-dev am: cb1969d46b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582201

Change-Id: Ice95434bbcfc772e134be2e5bc698ab43fd9fdf1
2021-09-16 00:49:18 +00:00
Bonian Chen
f9684e04ce Merge "[Settings] Avoid from immediate update when UI inactive and SIM absent" into sc-qpr1-dev am: 716e00ec43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15712667

Change-Id: I8cd4b8210b5879a5a69113e6b2e70e2f73e29cd5
2021-09-16 00:49:03 +00:00
TreeHugger Robot
cb1969d46b Merge "Fix hold volume keys don't trigger the one handed mode in One-handed mode settings page" into sc-qpr1-dev 2021-09-16 00:41:03 +00:00
Bonian Chen
716e00ec43 Merge "[Settings] Avoid from immediate update when UI inactive and SIM absent" into sc-qpr1-dev 2021-09-16 00:36:31 +00:00
Bonian Chen
e084bbca42 Merge "[Settings] Avoid from floating overlay when displaying SIM selection UI" into sc-qpr1-dev am: c6c769cd8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15712666

Change-Id: I24583fda6284542e82c85b7c25a35908e03817c1
2021-09-16 00:29:47 +00:00
Bonian Chen
656c965222 [Settings] Avoid from main UI thread blocking on accessing eSIM
1. Add timeout on background thread when accessing eSIM
2. Print log for debugging in the future.

Bug: 177843016
Change-Id: I64225af6ce87c98119c7a93c0944ad08d1390137
Test: local
(cherry picked from commit bda8c22267)
2021-09-16 00:21:31 +00:00
Bonian Chen
c6c769cd8a Merge "[Settings] Avoid from floating overlay when displaying SIM selection UI" into sc-qpr1-dev 2021-09-16 00:14:25 +00:00
TreeHugger Robot
2416ad383c Merge "Add toggle switch for auto rotate preference in display settings." into sc-qpr1-dev am: 8521fd6e36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15584663

Change-Id: I72218c7a47b7ec4b6574a0b0ea038b62a469cbda
2021-09-15 16:50:25 +00:00
TreeHugger Robot
8521fd6e36 Merge "Add toggle switch for auto rotate preference in display settings." into sc-qpr1-dev 2021-09-15 16:39:14 +00:00
Calvin Pan
e32a2abc16 Disable smart forwarding based on subid
Smart forwrading did not specify the subid when disabling feature, which
caused always dsiabled on default subid.

Bug: 194112447
Test: Enable/disable smart forwarding
Change-Id: Id900500f065c32b326ca6dfc39482f913fb9b8ff
2021-09-15 17:57:09 +08:00
Bonian Chen
f23f999e1c [Settings] Avoid from crash - SystemProp default null
Default system properties should not have "null" as default value.

Bug: 177843016
Change-Id: Idc2b3aaafd1094ba3fbfa859c4ad7a597e1b7a99
Test: build pass
(cherry picked from commit d2eda630e2)
2021-09-15 06:14:55 +00:00
Abel Tesfaye
dc909e2a13 Add toggle switch for auto rotate preference in display settings.
Bug: 183471038

Test: locally with flame & crosshatch
Change-Id: Iea4dbdd6df8a53f0fb79b82c97892256ad072c1d
2021-09-15 03:41:45 +00:00
Joe Bolinger
3452769f1e Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15759863

Change-Id: I3dbb1da09fe9ea625b37cce6ae85262893900e30
2021-09-14 22:23:25 +00:00
Joe Bolinger
63786513fc Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev 2021-09-14 22:08:23 +00:00
Joe Bolinger
8b3792d65b Add string ids to the result bundle for parental consent.
Bug: 198491515
Test: N/A (builds)
Change-Id: Id120f5f7a7e923f9d3ce7dd38d3e5214296ca219
2021-09-14 19:54:27 +00:00
Pavel Grafov
6b3e240d20 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: Iaee401d8cc88e9c5a48d5fee445ae44980eacdd1
2021-09-13 14:09:29 +00:00
Pavel Grafov
1ecc3166f0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Neil Fuller
51f8f5e6ef Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4 am: 4546286779
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I5e14da84bf0eb4d1db411b8ada82de2bbe5cfcb0
2021-09-13 11:38:28 +00:00
Neil Fuller
4546286779 Merge "Swap ownership to mingaleev@" am: f6fe44dc91 am: d2eca211d4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I93dfc80658af894e720cec0a2c0e0489ee67c53e
2021-09-13 11:30:54 +00:00
Neil Fuller
d2eca211d4 Merge "Swap ownership to mingaleev@" am: f6fe44dc91
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1824113

Change-Id: I9be5d173953df0a90ee1309feceed35f9240c18c
2021-09-13 11:17:50 +00:00
Neil Fuller
f6fe44dc91 Merge "Swap ownership to mingaleev@" 2021-09-13 11:03:08 +00:00
Pavel Grafov
36120b8a4c Respect PASSWORD_QUALITY_MANAGED for biometrics
Bug: 195488124
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=\
    com.android.settings.password.ChooseLockGenericControllerTest
Test: manual with a modified TestDPC
Change-Id: Ifa15877c735bb0f396051af04a4e012a606bf9e1
2021-09-13 11:50:06 +01:00
Bill Yi
c17d7563c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: a1fbab88b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ac735c3a33e3064ac010f4c2c940f43ecabbebf
2021-09-12 13:43:16 +00:00
Bill Yi
5b1fdf9c97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71dfd2c468ec965aa249177ad4d3cdb1ec2c3071
2021-09-12 13:43:01 +00:00
Bill Yi
b89b43bf79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours am: 7b59a40d17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icaed89a976f212712af5fc73c8256e03c04cccb2
2021-09-12 13:42:54 +00:00
Bill Yi
9f2415ea70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: 080db6b64d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I755e18813630f8815577e5a3f58af411077ce546
2021-09-12 13:42:43 +00:00
Bill Yi
a1fbab88b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2524cd8a07d10ec1cdf4aac42e972caa9e6a90f4
2021-09-12 13:28:23 +00:00
Bill Yi
a6262f4929 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf908ae1613110202f6bfa0ed16f575866121fb4
2021-09-12 13:28:15 +00:00