Commit Graph

85921 Commits

Author SHA1 Message Date
Bill Yi
ae2e00e1d0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -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: I067a00a8909307ae3f52c431d4d9507d286882d1
2021-09-20 13:29:05 +00:00
Bill Yi
bd4c0ff5eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -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: Ibc7043058da7c8a68c4605ada978fa58fe7b8171
2021-09-20 13:29:01 +00:00
Bill Yi
78507d697d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: 2cf7817de7 -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: I4848bbfd71eb759d93bb59620ccb0fc719d97f67
2021-09-20 13:28:52 +00:00
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
2cf7817de7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -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: I89cb67f37af3095da61f90fe665e6814bd592dfe
2021-09-20 13:27:54 +00:00
Bill Yi
66375d4530 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-20 13:13:42 +00:00
Bill Yi
a24dbc064f Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev
* 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
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
Bill Yi
fb733b7d84 Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
  Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:12:43 +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
13cb0a15ca [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: I4085a5981c367f77f97bc248c7f2c7b0c6ed0349
2021-09-18 17:21:27 +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
8e9c812e54 [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: I8d5c46d13d49354c21a5c434261e7c68290674b3
2021-09-18 17:10:55 +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
Bill Yi
7b93c3ea98 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaa16a73368d1b88512291d10b9c46abd127ab62e
2021-09-18 17:06:21 +00:00
Bill Yi
57b68bafb9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I78923511c8cd2c48b25e2105d234d4b510b5fe6b
2021-09-18 17:02:50 +00:00
Android Build Coastguard Worker
7030434ac3 Snap for 7744445 from 2e16b4a07d to sc-qpr1-release
Change-Id: Ia6d0fdfe513ec0038f26cd56ba4418e07d660ea9
2021-09-18 03:07:47 +00:00
Joshua Duong
c960e8973a Fix QR code scanner layout in "Pair devices over Wi-Fi" page.
The toolbar needs to be disabled to remove the empty space at the top
of the page. Also added the landscape layout xml.

Bug: 193602141
Test: atest SettingsUnitTests and manual

Change-Id: I30368835979b360a8f09e16f70adf57064784517
(cherry picked from commit fd009229e5)
2021-09-17 15:36:32 +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
Joshua Mccloskey
9f7c4cedea Updated settings preference title for work profile
Test: Verified string apperas in regular work settings.
Fixes: 193258818
Change-Id: I89671820a0bf900014567087e1e553e3ad7fe472
2021-09-17 02:07:53 +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
Android Build Coastguard Worker
c869e347fe Snap for 7740341 from ebe477db21 to sc-qpr1-release
Change-Id: I51ed0440a2ff1f032bba21b5f0092328fe43912a
2021-09-17 01:11:58 +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
J. Eason
8b822858cf Fix Wireless debugging icon alignment on developer options screen.
Added icon and dividers to realign and balance the screen layout.

Bug: 200139203
Test: atest SettingsUnitTests and manual
Change-Id: Ie5e89fd952f85bdf3fe0009b25ff127493e3cb95
(cherry picked from commit 4677bfbe25)
2021-09-16 18:41:05 +00:00
Ayush Sharma
49d20fa68e Fetch admin details if not present in Intent.
Get admin package/user details if this info is not present in the
intent(ACTION_SHOW_ADMIN_SUPPORT_DETAILS) received

Bug: 192245204
Test: atest MixedDeviceOwnerTest#testCreateAdminSupportIntent
      atest MixedProfileOwnerTest#testCreateAdminSupportIntent
      atest MixedManagedProfileOwnerTest#testCreateAdminSupportIntent

Change-Id: Idda6078a64c03588f0b786ebc79079198ab722fe
Merged-In: Idda6078a64c03588f0b786ebc79079198ab722fe
2021-09-16 12:13:21 +00:00
Android Build Coastguard Worker
7e19152d74 Snap for 7736530 from 8521fd6e36 to sc-qpr1-release
Change-Id: If160f1104ea81b71e863936cf3f1c4d9f2784fd1
2021-09-16 01:08:32 +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