TreeHugger Robot
91d1f44c86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours am: 5fdd0b386f
-s ours am: c484ac981e
-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: Ibda2b1982845ff3d9b9ad301f44ed3c93ebd2379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:03:36 +00:00
Bill Yi
ecb40fa5e7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours am: 6db82b3062
-s ours am: 9ba1e26bdf
-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: Iea1dd7b645779cc9a983e630beb24d40be691a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:03:18 +00:00
Bill Yi
aae3efd3a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours am: d28e552f18
-s ours am: 2cc27bc744
-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: I5c477aa374db4dbfd149e20bd37152c5abef6bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:01:55 +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
Bill Yi
b8a8d5b643
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours am: d28e552f18
-s ours am: 74bb796c67
-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: Ifddfa46a5fb334e85fa974e49dd55d8238b316f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:37:08 +00:00
TreeHugger Robot
1c60092e59
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3f63399f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520096
Change-Id: I6ecc198a8f7e4dee254ad1996b66fac8b7ca8962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:26 +00:00
Bill Yi
28a7510243
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62a52eccea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520096
Change-Id: Iad8b8bb94ca9fc261d7ce12b21829d50a9412552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:20 +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
TreeHugger Robot
229b1b70cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d097fe6e2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519375
Change-Id: I71231b17dd216cacd2c1afd7a884f4c78f622597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:03 +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
f45ffcfb2c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bc13fac28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519375
Change-Id: If110592529a0d3d25065daf17c0b3363f9ae91bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:32 +00:00
Bill Yi
74bb796c67
[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: I10f818e527b6b9329305a4f4d706210911934c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:30 +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
TreeHugger Robot
b3f63399f7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:30 +00:00
TreeHugger Robot
d097fe6e2f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:30 +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
c0f0ad8adc
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: I9a0991101c01b4008f1dd70ea11ba8d5fbd5e87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:04:09 +00:00
Tom Hsu
22e0b9beea
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572
am: 89f6686597
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260
Change-Id: I00b96bc50b83e401829e2db02dd9ab6a1c0c017c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 16:58:30 +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
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
Automerger Merge Worker
2a413effed
Merge "Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7
am: 82e1dbfbe4" into tm-d1-dev-plus-aosp
2022-05-23 15:59:01 +00:00
TreeHugger Robot
a136aade8d
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7
am: 82e1dbfbe4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: I3ca14d45daa9d3af34d2fe05ed1d2edae2645eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:58:58 +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
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
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
Automerger Merge Worker
9ffd7ecd8f
Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4
-s ours am: 19f9b738f7
-s ours
[automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6
-s ours am: c9a5086f3b
-s ours
2022-05-23 15:07:43 +00:00
SongFerng Wang
45fa5ccf19
[automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4
-s ours am: 19f9b738f7
-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: Ie86bc8f0ba092eb1dd17033a1db0b7e416489f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:07:39 +00:00
SongFerng Wang
8b4806562e
[automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4
am: a0553c9d16
-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: Id4019f316ea642eacf4820e16c4c3b6d70609d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:07:38 +00:00
SongFerngWang
aef126d3e6
[automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6
-s ours am: c9a5086f3b
-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: I2841769e5425b26a7b9033c11a17436d277a4aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:07:38 +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
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
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
cffca31ba3
Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634
am: 07cb063579
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216
Change-Id: Ice4443404f8d4d73c69db8fec4510069fa1a367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 11:10:42 +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
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
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