Tom Hsu
e2506fcdfe
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 7a69cee691 am: ab7057cb7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260
Change-Id: Idbdab31e3be14d61cb972bb5e75efff610a58be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:27:45 +00:00
Tom Hsu
ab7057cb7f
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572 am: 7a69cee691
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260
Change-Id: Ia8b4686e81f5d36c4750ec933c737e5e3b128ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:03:56 +00:00
Tom Hsu
7a69cee691
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: Ie38b70e0720bda4719f4154456cd4b54672ceb95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 16:38:08 +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
06bd83a1e5
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3 am: 768cc4e9a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: Iaeb54b18d5b5712d950b9b71ce3098e1b73a5567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 16:15:46 +00:00
TreeHugger Robot
768cc4e9a8
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: I6c9503a503d4f31b3982a912461b838f715a19d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:58:57 +00:00
TreeHugger Robot
f0c6b080a3
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: I74d9f38dd22294909ac6a5282e030b74d2093585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:58:56 +00:00
TreeHugger Robot
c59c58e1d3
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: I9f1a431164072830f6072a120adbaf125b325e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:32:33 +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
266a0ad585
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454
Change-Id: I97731177e18ff3aeab109656b7e639bcfa91a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:07:48 +00:00
SongFerng Wang
a0553c9d16
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: Ib62bae9b56074c7e7dd2d3a652f6a4075cf78e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 14:50:28 +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
4b8ffacaf6
Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 am: fe16309442
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158
Change-Id: I2368c602b04e7f0dbc123b2b2c258147054a893b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:31:04 +00:00
TreeHugger Robot
e18662f02a
Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 2a34e48069
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216
Change-Id: I22871089af43978fe448825e37bbe7a1faa3e5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:30:10 +00:00
Treehugger Robot
fe16309442
Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158
Change-Id: I4effb7ecf2aeec745a6e6918ca80f76ef1d58478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:10:51 +00: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
TreeHugger Robot
197b3072b5
Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216
Change-Id: I87164cccc6b47247bb4db42d122f301c75647d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:10:16 +00:00
TreeHugger Robot
2a34e48069
Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216
Change-Id: I8d2bd68530fc32cae6b354dd1e6c7df3ce3119b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:10:15 +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
ac572e72a6
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: I0a317f53e6578ee245d54c3993267ab08d803161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 10:53:24 +00: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
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
Jason Chiu
5bc2dc4ae9
Simplify the duplicate click checker logic
...
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
2022-05-23 12:57:19 +08:00
Chaohui Wang
3fdd89556e
Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674
Change-Id: I98d0c3ab385539d258baad72beb048aa0c563e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:44:42 +00:00
Chaohui Wang
456a27bee3
Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674
Change-Id: I3b9ae5d0e02db28f8965d158d97937b8b2603433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:28:32 +00:00
Chaohui Wang
52507eb518
Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674
Change-Id: I54efb9201eb76f49297a86ce9aac430c2fbd7989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:28:27 +00:00
Chaohui Wang
f61254af3c
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: I59fbcd9e9646f2a7fab8fd0410768b08b06f6512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 02:10:18 +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
b9a06a9f34
Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903
Change-Id: I2f7ce317b7bb9d355fbb1e5f0fc2aacb1da7f8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-21 00:02:22 +00:00
Edgar Wang
42704ba27c
Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903
Change-Id: I70547c9094cdd200f1fa2a77272affbcbe308a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:52:43 +00:00
Edgar Wang
21ddf79998
Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903
Change-Id: If0fba8bf4c69645bf8cc6a153580ed7cda57610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:51:54 +00:00
Edgar Wang
4d371adf7f
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: Id0599efcfd1a61b12e4e759afb76259f14fdd5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 23:25:32 +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
8734e549a0
Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 12cc3aeae0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285
Change-Id: Ib2aafb5ccca14534c30a6d3b555bc9fdec8e9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 19:54:16 +00:00
TreeHugger Robot
12cc3aeae0
Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285
Change-Id: I468f2cce8f5d67055addc01ef4749b1cf98b5896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 19:33:43 +00:00
TreeHugger Robot
ef922caf2e
Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285
Change-Id: I72bbadfe8be1d2710704dc5c85d54c0d7d6ff6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 19:24:51 +00:00
TreeHugger Robot
f36d767679
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: I2a4e530320564961901f96af333e47dd019aa226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 19:14:12 +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
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
ac59647901
Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 9fb34ae376
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029
Change-Id: Ib2ecd69665ad7e35c7f8c15823388e9ad75d721f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 17:22:38 +00:00
Hank Sheng
033a744c95
Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029
Change-Id: Iac318ff0b836ac2148c1c08f28298655f8596fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 17:06:50 +00:00
Hank Sheng
9fb34ae376
Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029
Change-Id: I4aa2af07a568f4a67e47d52959f74004f4c8990c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 17:06:48 +00:00
Hank Sheng
37c36d0c63
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: I155d06cf2e6c0adf93426d35075b8ebeb71b84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 16:49:13 +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