TreeHugger Robot
b10a49aa9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I62579640559e5363af47feb064aac86ff7dd9dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:52 +00:00
Bill Yi
a16ae9af90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I2f137c46079fc6074d38a3d4cf7977c02ecd4069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:37 +00:00
TreeHugger Robot
0a367dea1d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-24 00:38:21 +00:00
TreeHugger Robot
5427fb0dbf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours am: 5fdd0b386f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I0126d7bcaf8f8c91be065baeeb77cf3d52ee9206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:43:42 +00:00
Bill Yi
5fac07d5ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours am: 6db82b3062
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I95fd589b5be408d561d73c5b1a18e420e789f63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:43:26 +00:00
TreeHugger Robot
5fdd0b386f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I12819ca7ba3388a2d3379ba419f489086ca090d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:10 +00:00
Bill Yi
6db82b3062
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I09c5bc7d92a8b7c1371d938c219b0cf0d2ebacc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:50 +00:00
Bill Yi
223c361bb7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours am: d28e552f18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: I3db5616ca28733d5c41ca14534f3aa0132f9a731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:31:28 +00:00
Bill Yi
d28e552f18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: Ie4c9dd453c4b845cdde6abefbf8eb3ddd32c7619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:00 +00:00
Weng Su
77f9cbe315
Refine carrier Wi-Fi functions
...
- Sync the same design to query and set carrier Wi-Fi enabled status from MergedCarrierEntry
- Add more logs for issue tracking
Bug: 227236604
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
WifiPickerTrackerHelperTest
Change-Id: I869fa97bd24ed31a3224b4a395ffc97a17aa1471
2022-05-24 03:16:36 +08:00
TreeHugger Robot
f398b474af
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-23 18:49:25 +00:00
TreeHugger Robot
256d5aef09
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-05-23 18:49:25 +00:00
TreeHugger Robot
a39043d1ab
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-23 18:42:17 +00:00
Tom Hsu
1d10e1b709
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260
Change-Id: Ibdfe45c8f2003d0c19ebab6f8cae15761f39ed5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 16:35:42 +00:00
Tom Hsu
883f5e2572
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev
2022-05-23 16:17:54 +00:00
TreeHugger Robot
6726e22900
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: Ic25f86dc1ba1f64b40ce59aafa5d9ff09b6459eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:31:25 +00:00
TreeHugger Robot
39eb991aa7
Merge "Fix crash when operator name contains %" into tm-dev
2022-05-23 15:16:36 +00:00
SongFerng Wang
93e5302f36
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454
Change-Id: Iee14b55bef29faf62d826e106d491456dc452b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 14:49:26 +00:00
SongFerng Wang
96bd20dca4
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev
2022-05-23 14:23:39 +00:00
tom hsu
7e27ecb91e
[Panlingual] Fix icon shall have work badage in work profile.
...
Bug: 233064114
Test: local
Change-Id: I8aa24373f0381b172c30d16aedb2f9ba97238234
2022-05-23 19:34:51 +08:00
Chaohui Wang
02eb0aa980
Fix crash when operator name contains %
...
Currently, cannot use ListPreference.setSummary() when the summary
contains user generated string, because ListPreference.getSummary() is
using String.format() to format the summary when the summary is set by
ListPreference.setSummary().
Use preference.setSummaryProvider() instead, which is recommended for
ListPreference.
Fix: 233295254
Test: manual
Change-Id: Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39
2022-05-23 19:02:20 +08:00
TreeHugger Robot
949fe61ddd
Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216
Change-Id: Iab0b68a6c75decaeb8a9ef07dee3e7bb47581812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 10:52:19 +00:00
TreeHugger Robot
02d3965634
Merge "Simplify the duplicate click checker logic" into tm-dev
2022-05-23 10:24:18 +00:00
SongFerngWang
0167a4d8a6
[LE unicast] Disable the "phone calls" when LE is enabled
...
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.
Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
2022-05-23 17:34:48 +08:00
Bill Yi
fb1885708b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761
Change-Id: Ic47f286fe9cb7e04d88d4686ac49059efe1b2b9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 05:07:31 +00:00
Jason Chiu
5bc2dc4ae9
Simplify the duplicate click checker logic
...
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
2022-05-23 12:57:19 +08:00
Bill Yi
750cea242e
Import translations. DO NOT MERGE ANYWHERE
...
BUG:233440940
Auto-generated-cl: translation import
Change-Id: Idbd4c9ec8105849b762afae06c780c47185fda65
2022-05-21 09:20:58 -07:00
TreeHugger Robot
b307e7f12f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105
Change-Id: I0706a0c6b65f7f5fa47a039a0fbd92c98776c52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:18:09 +00:00
Bill Yi
1ec1446d04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105
Change-Id: Iccc0246524c4712052d763b078bd70d336d7a4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:18:01 +00:00
TreeHugger Robot
97a3f54878
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-21 02:12:55 +00:00
Chaohui Wang
e50e40098f
Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674
Change-Id: Id7a9e00ed4fc34263ced3c87de76c5a44be65c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:09:02 +00:00
Chaohui Wang
0dc89bc85c
Merge "Fix Conversation page flickers when back" into tm-dev
2022-05-21 01:54:27 +00:00
Edgar Wang
792ff94f89
Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903
Change-Id: I5ef42026d028a1ab167ea743a081df563cb77b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:24:37 +00:00
Edgar Wang
24654a3d61
Merge "Update learn more string of FooterPrefernce" into tm-dev
2022-05-20 23:13:07 +00:00
TreeHugger Robot
70ffa88eaf
Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285
Change-Id: I3642080e0f9ffd7bd7a164da8b8c26fe2f8507a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 19:03:40 +00:00
Bill Yi
26be41c615
Import translations. DO NOT MERGE ANYWHERE
...
BUG:233360920
Auto-generated-cl: translation import
Change-Id: I264f7b7815e65b65892d9bdf62b7748ac392efaf
2022-05-20 18:28:22 +00:00
TreeHugger Robot
baa2c48575
Merge "Filter out the duplicate click event on menu page" into tm-dev
2022-05-20 18:18:58 +00:00
Hank Sheng
73a78072af
Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029
Change-Id: I12d7046ca23c20fb0b67324c61172ffeebc8a638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 16:48:04 +00:00
Hank Sheng
841964c02b
Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev
2022-05-20 16:27:56 +00:00
Jason Chiu
e04dfaa29e
Filter out the duplicate click event on menu page
...
Whenever the highlighted item is clicked, Settings shouldn't start the
second-layer page again even if the user goes to its child page.
Ex. When the user goes to the Tethering page, clicking on the menu
entry "Network & Internet" should not switch to the page.
Exception: in the deep link case, allow the first click event on the
highlighted item to launch the second-layer page when the page is not
the same as the one on the right pane.
Fix: 215267159
Test: manual, robotest
Change-Id: I2315e0069facc4867cb157752b1a3144716b7d17
2022-05-20 15:01:31 +00:00
Bill Yi
0c0b16955b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f6bcb27ceabafc988752c5f988519bc1217f121
2022-05-20 07:21:29 -07:00
Bill Yi
70a7ba0f71
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice7a5337a3736a6fba30fd25ea1adfcdcad9dc75
2022-05-20 07:02:12 -07:00
Bill Yi
f9b665e302
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6bab2e5fd4e3902f5a2858f9cec57685e975460d
2022-05-20 06:57:34 -07:00
Bill Yi
db9218dcec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I87f67daa4c3c8c0f063d64630852b2a19bdb2ffe
2022-05-20 06:51:51 -07:00
Bill Yi
535ccbdbb1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1128d6fb3509e184740b733a019bd7656831b2ae
2022-05-20 06:44:33 -07:00
TreeHugger Robot
50b71c3eaa
Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386
Change-Id: I6469c6b69b371c1a779160063d4ed1aeb29f40b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:30:02 +00:00
TreeHugger Robot
9a35add550
Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044
Change-Id: I9667106ce8e8f88b948d2ae8a18bb84fa3159d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:29:24 +00:00
Chaohui Wang
6e4e6fcdbf
Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942
Change-Id: I96d96ccd1a25c008443855ba2b5e6fcc80cc0112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:29:01 +00:00
TreeHugger Robot
fea570f524
Merge "Revert "Show previous query upon configuration change"" into tm-dev
2022-05-20 12:27:55 +00:00
TreeHugger Robot
d017261dd6
Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928
Change-Id: I88933010aabbbb0210d8833440f3d92ffbb2db37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:26:15 +00:00