Commit Graph

102580 Commits

Author SHA1 Message Date
TreeHugger Robot
4a926629e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72344a0005c60e1eb94b7e9c572d96c1ef0602dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:32:07 +00:00
TreeHugger Robot
1098e80d27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifae4927b645d2cb6850e4a3df4d692d2945158cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:32:02 +00:00
TreeHugger Robot
4d87a40a2e Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68" into tm-mainline-prod am: 8cf398f54c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178

Change-Id: Ia57704f0a5ffe19d88fa8acc3aaf6054dbb6076a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:24:40 +00:00
TreeHugger Robot
2992165ee3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: daef9fa397 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12d85ea178a2ef5005f6b5f61b497b88c2cbac69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:23:42 +00:00
TreeHugger Robot
09b761700d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-28 19:07:49 +00:00
TreeHugger Robot
8cf398f54c Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
  Import translations. DO NOT MERGE ANYWHERE
2022-03-28 19:07:49 +00:00
TreeHugger Robot
6d3031f99d Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab 2p: af27e56740
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
  Import translations. DO NOT MERGE ANYWHERE
2022-03-28 19:07:49 +00:00
TreeHugger Robot
daef9fa397 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-28 18:56:52 +00:00
TreeHugger Robot
83277399ac Merge changes from topic "presubmit-am-3dfc11e67f034df8bec0f0cb5665ba32"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c0a1868fbd
  Import translations. DO NOT MERGE ANYWHERE
2022-03-28 18:56:52 +00:00
Ronish Kalia
bb75ff2158 Merge "Update settings strings as per UXR" 2022-03-28 15:49:52 +00:00
Jack Yu
d01497a5de Fix "learn more" link is not clickable
Use function setLearnMoreAction instead of ClickableSpan in
NFC FooterPreference.

Bug: 226299551
Test: maunal test
Change-Id: I69c494b3e6fc92940d498d8be0c9ef5041b1bb3b
2022-03-28 22:42:45 +08:00
ronish
9a91a86aba Update settings strings as per UXR
Change-Id: Iccac0c658b4a7552e4f4a6ff78693bcdd344c318
2022-03-28 11:58:14 +00:00
Yi-Ling Chuang
0bf3ed99eb Fix flickers on the Location page
Use the UiBlocker and its delegate method to prevent the flicker.

Fixes: 220837804
Test: Go to Settings > Location and see all items appearing at the same
time.

Change-Id: I2095289b9436ca66970b6a868d5c9780f2b19664
2022-03-28 17:27:34 +08:00
TreeHugger Robot
41557ecc36 Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e am: 23c2c3da41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177

Change-Id: I1d8345ab2cb5846a7d2445280f64eefabd6e0eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 09:15:28 +00:00
Giulio Fiscella
decb701e7b Merge "Use migrated severity levels" into tm-dev am: a493ed6f75 am: 918ae23a07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684

Change-Id: Ie1a1e5cdc00ab6af0f444464e58cefda58dd3740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 09:15:20 +00:00
tom hsu
ded10f8e24 [Panlingual] Improve and refactor revamped UI
- Remove useless file
 - Make Icon be able to scroll up and down

Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-03-28 17:13:04 +08:00
TreeHugger Robot
23c2c3da41 Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177

Change-Id: I19e0a83052b44b6a0c09acaac2dc714477846995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:59:40 +00:00
TreeHugger Robot
e5cb2a170a Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177

Change-Id: I80be1a5786880a4b85ccad6b3444675d9e3cf026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:59:35 +00:00
Giulio Fiscella
918ae23a07 Merge "Use migrated severity levels" into tm-dev am: a493ed6f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684

Change-Id: Idf5621c4b257ef7f823e4dc072ca7e416d53ff5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:59:33 +00:00
Giulio Fiscella
16c4c3ead1 Merge "Use migrated severity levels" into tm-dev am: a493ed6f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684

Change-Id: I9cb06c36b2e9effb40e94f426a23c81aa298c055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:59:26 +00:00
TreeHugger Robot
5fd1f8fe4e Merge "Restrict secondary users to share Wi-Fi network" into tm-dev 2022-03-28 08:43:23 +00:00
Giulio Fiscella
a834645b92 Merge changes from topic "scAPItm" into tm-mainline-prod am: 7aa25402d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684

Change-Id: I3f6d2e644b49d54773de03ee22f88393d8c79bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:42:04 +00:00
Giulio Fiscella
7aa25402d2 Merge changes from topic "scAPItm" into tm-mainline-prod
* changes:
  [automerge] Use migrated severity levels 2p: 2a775c69fc
  Use migrated severity levels
2022-03-28 08:38:47 +00:00
Giulio Fiscella
a493ed6f75 Merge "Use migrated severity levels" into tm-dev 2022-03-28 08:38:47 +00:00
Giulio Fiscella
362f0abf6d Merge changes from topic "scAPItm"
* changes:
  [automerge] Use migrated severity levels 2p: 2a775c69fc 2p: b5446ce437
  [automerge] Use migrated severity levels 2p: 2a775c69fc
  Use migrated severity levels
2022-03-28 08:38:47 +00:00
TreeHugger Robot
6b1148faec Merge "Rename the wording for "Wallpaper" under About" into tm-dev am: 32ac672ea5 am: 367cfd4fc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Iebd674696c3e0b8b37e1eada5fea2cb95844575a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:36:17 +00:00
TreeHugger Robot
b39ae8cdfa Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073" into tm-mainline-prod am: 5eef5f7c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: I3056764eee6883d5af594fd9f984e2ca61421589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:35:24 +00:00
TreeHugger Robot
367cfd4fc3 Merge "Rename the wording for "Wallpaper" under About" into tm-dev am: 32ac672ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Ib778211b70d66ef936a03f4c83cd5fba66fa7156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:33:47 +00:00
TreeHugger Robot
0d2a6a6f45 Merge "Rename the wording for "Wallpaper" under About" into tm-dev am: 32ac672ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: I11a640d463be4591ecd1f8814e3d0909d411f035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 08:33:26 +00:00
TreeHugger Robot
32ac672ea5 Merge "Rename the wording for "Wallpaper" under About" into tm-dev 2022-03-28 08:07:03 +00:00
TreeHugger Robot
5eef5f7c0e Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073" into tm-mainline-prod
* changes:
  [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2
  Rename the wording for "Wallpaper" under About
2022-03-28 08:07:03 +00:00
TreeHugger Robot
bfba7b5cc4 Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073"
* changes:
  [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2 2p: 0427d13d07
  [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2
  Rename the wording for "Wallpaper" under About
2022-03-28 08:07:03 +00:00
jasonwshsu
906805a591 Set title to the hearing aid pair instruction dialog
Bug: 225117843
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidDialogFragmentTest
Change-Id: Ia1f3dadba84e3302a87aba1274e77f31a74eea1b
2022-03-28 15:31:43 +08:00
Menghan Li
e8b6546410 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474 am: 988ff40ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586

Change-Id: Iba76f62d7a67366c4f48ef2cb0bed79b92a6dbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:25:24 +00:00
Menghan Li
988ff40ec2 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586

Change-Id: Id7492a2d81b64929ae6b1ec4d1ea4f8135212b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:06:38 +00:00
Menghan Li
7325d18d30 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586

Change-Id: I3e7576cc35c3088957d2976726c14971bf9defe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:06:25 +00:00
Treehugger Robot
0818a1c62b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2d06b535518562830aeaed8b0f9f647e202ee68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:02:14 +00:00
Bill Yi
2b1435d300 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib485ceb1142d2e15bc2541fda0850a9cd02b40cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:02:13 +00:00
Treehugger Robot
c5142845f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I327ae4de3c8675c2da6a735ef6cadcf3310b6976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:01:19 +00:00
Bill Yi
e68d843167 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id571c60c7cf39d4f4327e67e692e1fe6ad73bae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:01:18 +00:00
TreeHugger Robot
0e536d93b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd818627964fd287182375db9e2e91789a885c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:51:36 +00:00
Bill Yi
cc3a93e23b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I977992bbe1a5875e6827128bb3495afee8d71a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:51:34 +00:00
Treehugger Robot
178ba3e57d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9969ee7d5bb026824736ebbba3c43c18f2343e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:45:52 +00:00
Bill Yi
5f55cb2ed8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I765e946f2e8e04370891f50fa42bcde6fe424c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:45:51 +00:00
TreeHugger Robot
2703c29227 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a2febfb3742ac359a86226e0f1cc6a964ec8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:45:06 +00:00
Bill Yi
620782b9d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabad895ae533c8779bc8bc3f9330a520fae7f967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:44:52 +00:00
Treehugger Robot
3ad321509f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie231da55ce887649cc28e0fec042b24b109d9379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:43:36 +00:00
Bill Yi
b28c27e68e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I031a74875cddf5b00bebfbf1d23b5afc9c1fe7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 06:43:25 +00:00
Menghan Li
c122879474 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev 2022-03-28 06:43:20 +00:00
TreeHugger Robot
97539de67e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-03-28 06:27:30 +00:00