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
02a77829b2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours am: 59657f177e
-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: I977819a7838da29d7bb06066a49653101153614d
2021-09-20 06:47:35 +00:00
Bill Yi
a78dd639be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours am: a5e8168fba
-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: I0a3e4ecee84b8d9cf4e9157a6edff726df54858d
2021-09-20 06:47:23 +00:00
TreeHugger Robot
5dc558bf34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e9200b19ad
-s ours am: 497e2a9ef1
-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: I54208f11995b7bf244fabd07edc9bcfa8b9e1c92
2021-09-20 06:36:38 +00:00
Bill Yi
7d85761778
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 918492ab2a
-s ours am: 3d70903686
-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: I04f5196c5d47327b9f38345f2ecb08cf3599dd3b
2021-09-20 06:36:21 +00:00
TreeHugger Robot
ae7abb19af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ab040df5fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860619
Change-Id: Id54a2607c1c320aff3cb10626858d8fab7dbf5f0
2021-09-20 06:35:56 +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
69668617dc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2f0cdea1f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860647
Change-Id: Ifd5b519f6e608937c0a18b7b3c5f3bfe7e353cce
2021-09-20 06:34:40 +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
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
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
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
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
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
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
c4b3178c56
Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d
am: 6bd4441314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400
Change-Id: I522caf1942a395f3f30cdc495a96c0d96f8cb2b3
2021-09-17 13:56:00 +00:00
TreeHugger Robot
311e9b48aa
Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d
am: b96d734511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400
Change-Id: I571a1a9f628ce90dcc4b899ca421c044f4f7bdd7
2021-09-17 13:55:40 +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
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
c8c9a75eb8
Merge "Disable smart forwarding based on subid" into sc-qpr1-dev am: 216315523b
am: aab38e2b34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15819074
Change-Id: Idb778982d7c8bfbbe22435b39e85688f7a19b076
2021-09-17 06:07:43 +00:00
Bonian Chen
4d83f7aa76
Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev am: ebe477db21
am: e44708ea39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824485
Change-Id: I980b71340895bc44902c70c436bf2ac54ff28a5e
2021-09-17 06:07:09 +00:00
Bonian Chen
82bec1e02b
Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM" into sc-qpr1-dev am: 213c9ca658
am: 4f30c84b68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15838828
Change-Id: I607719d8cc8ac7ab0dfff1e38a9758c87bb46edb
2021-09-17 06:05:36 +00:00
TreeHugger Robot
67af6112ef
Merge "Fix hold volume keys don't trigger the one handed mode in One-handed mode settings page" into sc-qpr1-dev am: cb1969d46b
am: 75ef7717b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582201
Change-Id: I1cd1cc9e86b4dd2c583b423f1cf0b88ba041121b
2021-09-17 06:04:11 +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
c7560a39e8
Merge "Disable smart forwarding based on subid" into sc-qpr1-dev am: 216315523b
am: 6e51289e9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15819074
Change-Id: Iaa365ffddefba0d5692b3e5be663c20a9aa2e8e5
2021-09-17 02:02:01 +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
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
666d5776db
Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev am: ebe477db21
am: fdab21bafa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824485
Change-Id: I3b894ec349f0f17b7a5cdb4d5d6a4a5d90d67523
2021-09-16 19:42:40 +00:00
Bonian Chen
7759f963cc
Merge "[Settings] Avoid from main UI thread blocking on accessing eSIM" into sc-qpr1-dev am: 213c9ca658
am: b8c59b803f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15838828
Change-Id: I758a81dcba0fda84aad70d9445de16a7edb8a325
2021-09-16 19:42:33 +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
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