TreeHugger Robot
d9174aa3cc
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev
2022-05-24 03:51:23 +00:00
TreeHugger Robot
17093f454c
[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: Ibbf5b2d45f16c91642b1365e806c94224150a421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:22 +00:00
Bill Yi
410d895879
[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: I82befbbb0ca1534c2fd0c892c892592358113773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:05 +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
c484ac981e
[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: I9073902b4178775ca9f68828ab232430d185aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:43:52 +00:00
Bill Yi
9ba1e26bdf
[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: Ibc9231c1d7e7ca25a556d32e7a62bbc97589927d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:43:35 +00:00
Bill Yi
2cc27bc744
[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: I6af815ee0f119c755a3b9414c4092d46caef9bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:42:18 +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
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
138ee00007
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-05-23 18:50:09 +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
89f6686597
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: I94ce4c82f3de7a2fb01b68ec1ec3b630c8ac8b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 16:35:28 +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
82e1dbfbe4
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: Ia3a06bbe0edbc369cb71a2a4f807a2061aff5783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:31:00 +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
19f9b738f7
[automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4
-s ours
...
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454
Change-Id: Iba28e980ce4e2dfd37375761f96396c816ca7086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 14:48:48 +00:00
SongFerngWang
c9a5086f3b
[automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6
-s ours
...
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454
Change-Id: I112177ccab0ef01edad24830e01503390471e5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 14:48:45 +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
Treehugger Robot
38f8c61722
Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68
am: 2b7eb9eff6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158
Change-Id: I9e3a0b69e3baf2c0691c898acda20d6a0b65b953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:10:27 +00: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
2b7eb9eff6
Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158
Change-Id: I5685d61f33acf4fbf4b5ff8356a487f77d314bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 10:52:07 +00:00
TreeHugger Robot
07cb063579
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: I470de9e89f9b36b2797a8260d7617e96712c52da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 10:51:57 +00:00
TreeHugger Robot
02d3965634
Merge "Simplify the duplicate click checker logic" into tm-dev
2022-05-23 10:24:18 +00:00
Treehugger Robot
97b4621c68
Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate"
2022-05-23 10:21:02 +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
Håkan Kvist
6f1b6e3693
Call CardDatabaseHelper.getInstance() when used and not in onCreate
...
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.
Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.
Test: Start device with sim card inserted and Pin enabled on sim.
Wait some time before entering sim pin. After entering pin, open
settings. Verify that settings does not crash.
Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
2022-05-23 09:08:30 +02:00
Bill Yi
153aaf7682
[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: I2f2c0c4b54bccf5e3e6966297d08813d27aeac7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 05:08:17 +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
be66d387e9
[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: I6001aab1e0cbac0515c44f40a92d2486ff58f49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:17:56 +00:00
Bill Yi
ea8b3f83b2
[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: Id60653015a9a4344e2428a51390806f449f4ea4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:17:40 +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
0d6569d199
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: I911dc4f729e7d6eeb0fda8b12f16d8a153cb6bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:08:39 +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
eaa0a1cf5c
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: I10a24e8723d555c9bf81ee0efff9dea9d56bf736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:24:36 +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
96d31478ab
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: Ife6c05fc69d672a15d1bbbb8e06ba87e2f3a3ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 18:58:15 +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
434e728bce
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: I11fd085f1798f2ebaab2b14951716038379e2848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 16:47:41 +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
0fc6315b65
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I70f0d00ed8fe7c13e0065a1a5f435a7a361a6b93
2022-05-20 06:48:09 -07:00
Bill Yi
ca3a25c900
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id69c2a43ac584d2e7f6cf9a5889884f7e5707127
2022-05-20 06:43:01 -07:00