Bill Yi
34bbccd412
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I3dea5f12e5769d7910f9cbd813b6e89c1a33afdc
2021-09-20 14:44:19 +00:00
Weng Su
caa29d401b
Minor change to Wi-Fi WPA3 password length restriction
...
- Change the maximum length limit to 128
Bug: 200305860
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: Ia739dab35da75c73e28077ccc81979253def6128
2021-09-20 22:38:29 +08:00
TreeHugger Robot
b65f46dce2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Iee57b257fde74ff26a1f5761c999e71f9ee3c809
2021-09-20 14:30:15 +00:00
Bill Yi
79c2a1e72e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I0e3eaaf2db60a51fd7a6d7ea0a4f7366c036a147
2021-09-20 14:29:29 +00:00
TreeHugger Robot
8fc132c073
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: If21bd8380189f5615c8531bab311cbb7847742d7
2021-09-20 14:16:53 +00:00
Bill Yi
977610714f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: Idc00c683438341c8024aa8050982745a71f32840
2021-09-20 14:16:34 +00:00
TreeHugger Robot
7a8b043da7
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-20 14:04:47 +00:00
Bill Yi
9440aa4378
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-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: Iae681d3e4c03751edaa64d18d0307837069a0fd2
2021-09-20 13:29:41 +00:00
Bill Yi
82e2ee2a19
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I971b708ead65b7280781fda0ef2fe4c3f059fbd4
2021-09-20 13:29:36 +00:00
Bill Yi
2dda71d5a4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-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: I7a5a0c940fb48171d1b4a0f0e27b637e6ba94846
2021-09-20 13:29:35 +00:00
Bill Yi
488e676e07
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: Ibca51c31152956772bd7f2d312e7d8158d0af9b6
2021-09-20 13:29:19 +00:00
Bill Yi
b50c2b8618
[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: I90481230c65ee912ab5bd67ba1b4228288ef69ac
2021-09-20 13:29:18 +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
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
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
497e2a9ef1
[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: I8b80fcff9238db87538f802cf2513982c40cac4b
2021-09-20 06:35:17 +00:00
Bill Yi
3d70903686
[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: Idebf6803d8b02897c85ede92394b94a563089065
2021-09-20 06:34:35 +00:00
TreeHugger Robot
ab040df5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-20 06:20:06 +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
d2f0cdea1f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icba51573325d71efe8f7aa4cd4515eb57968778c
2021-09-18 17:28:47 +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
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
c5489eafd7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I17fd716757c5a61109f4d9f8729d2f939fa16674
2021-09-18 17:13:50 +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
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
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
6bd4441314
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: I3fe4948f72389c2b6e25adbb701f3ea8315d2340
2021-09-17 13:41:38 +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
aab38e2b34
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: I5f15b643e74e226ebdb5a5c742564b20ae7b7901
2021-09-17 01:48:02 +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
e44708ea39
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: I38e52004ee7a1f5bf794f167d835e32c08ecb90c
2021-09-16 19:24:09 +00:00
Bonian Chen
4f30c84b68
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: I2cc59d5612adf62b51c063c011ab7f4547a4a160
2021-09-16 19:24:01 +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
TreeHugger Robot
75ef7717b8
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: I0b1626bc6f195dcae130eefb6d34e7940cc50237
2021-09-16 00:49:14 +00:00
Bonian Chen
01765967d7
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: Id0f8fd5e29c31b8a3b1a65ea689e18a91cf0e4b1
2021-09-16 00:49:04 +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
e85d78b14e
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: I72d0ccacaa8a748d2bc2bf5d0121c560f9541db7
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