Zhen Zhang
07edb930c2
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065
Change-Id: I375e6de0cfa3c6c0e2cbc0110194352885379e72
2020-07-06 19:04:54 +00:00
Zhen Zhang
05ae65b7b0
Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev
2020-07-06 18:54:47 +00:00
android-build-team Robot
b3324c2046
Snap for 6654331 from 64b2bad3d7 to mainline-release
...
Change-Id: I4e32a3b0bbb775287fec0a616fd3fdf9c995b0f4
2020-07-06 03:09:47 +00:00
Jason Chiu
267a1df2a6
Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287
Change-Id: Iaa56d2525b86680aa6badf258cdffe0013078a6f
2020-07-06 03:03:56 +00:00
Jason Chiu
4334b51165
Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287
Change-Id: Ib2169fa737b0c6344b77860896a6f4fa5b98ef41
2020-07-06 03:03:56 +00:00
Stanley Wang
1e05cbb580
Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563
Change-Id: I1aecef654565cc8520a720a20cc5c3afb1a17378
2020-07-06 03:03:49 +00:00
Stanley Wang
1b46da552b
Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563
Change-Id: Iad921b378bc6e87d656711bf76ee149a7380a1ad
2020-07-06 03:03:47 +00:00
Jason Chiu
98eedf79d5
Merge "Fix the exception of accessing an ArrayMap" into rvc-dev
2020-07-06 02:48:31 +00:00
Stanley Wang
6458ea872c
Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev
2020-07-06 02:45:51 +00:00
TreeHugger Robot
64b2bad3d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081073
Change-Id: I7a285c274e4e77f451265e23f42d1e5ad1f04cfe
2020-07-06 00:16:45 +00:00
TreeHugger Robot
5aca5b752c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081073
Change-Id: Idb18c6816cc05929ee7092ee686aa5e19785cc53
2020-07-06 00:16:40 +00:00
TreeHugger Robot
32cca3cb83
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081073
Change-Id: I1ccbbb5c5c2de481e72808820b1035d35a0bf1f3
2020-07-06 00:04:51 +00:00
TreeHugger Robot
f2528db4de
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-07-05 23:43:58 +00:00
Bill Yi
50d226b634
[automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081070
Change-Id: I03a1fd779f295328c6b19ee9205af23126ad775d
2020-07-05 21:00:09 +00:00
Bill Yi
81805ce25f
[automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours am: 94d87aa5f4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081070
Change-Id: Ia7ec3f8f10bf6942f7b30a8703664166ddf0aed1
2020-07-05 20:59:51 +00:00
Bill Yi
94d87aa5f4
[automerger skipped] Import translations. DO NOT MERGE am: 435bee70ea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081070
Change-Id: I2e259f31598ec919754135ea245d023b443b9446
2020-07-05 20:50:14 +00:00
Bill Yi
6507b1e828
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic9dae74f8978425037e22523d26fc96e77a24289
2020-07-05 13:10:30 -07:00
Bill Yi
435bee70ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I83c60d95313ae0a41616573648a163ae31a8145d
2020-07-05 12:34:41 -07:00
Bill Yi
a5782201b0
[automerger skipped] Import translations. DO NOT MERGE am: 2a483616ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12077896
Change-Id: I78e463470e9ee6091a1be66130151a19b86ba728
2020-07-04 05:11:12 +00:00
Bill Yi
00807a5a23
[automerger skipped] Import translations. DO NOT MERGE am: 2a483616ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12077896
Change-Id: If4bd1f995dba24a4cdd02e2945badcd00d06b72a
2020-07-04 05:11:11 +00:00
android-build-team Robot
7a4a01c05d
Snap for 6652446 from e16bac067b to mainline-release
...
Change-Id: I816cc8a7b8cef4623439777ee53ada27043ee85c
2020-07-04 03:04:26 +00:00
Bill Yi
2a483616ec
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I366c375aa973a601c98395d6052e1bcb42b69e8c
2020-07-03 19:09:34 -07:00
Wei Huang
012c5858c9
Fix mvno data field summary not update issue
...
With current code logic, whenever user changing
mvno type, it only updates mvno data field text,
but the summary is not get updated.
For example, there is an apn configured as mvno
type 'GID' and mvno data 'FF', and user changes
mvno type to:
1. 'none' then save, the APN is saved with mvno
type 'none' and mvno data 'FF' while it is
better to save mvno data as empty value.
2. 'imsi', although the APN can be saved with mvno
type 'imsi' and mvno data 'mcc + mnc + x',
the UI still display mvno data field as 'FF'
unchanged(until user edit mvno data then save)
while the mvno data text is already changed to
'mcc + mnc + x'. It is better to also update
mvno data summary as 'mcc + mnc + x'
With current patch, either adding new apn or edit
exist apn, the mvno data field summary is always
consistent with latest mvno data field text, which
won't make user feel confused.
Test: Build and manual test on device.
Change-Id: Ica72e246296c20a6d20283b315e6e6c46e80ac08
Signed-off-by: Wei Huang <hwbest.v@gmail.com >
Signed-off-by: Honggang Luo <luo.loky@gmail.com >
Signed-off-by: Chao Yuan <chaoyuanx@gmail.com >
2020-07-04 04:11:52 +08:00
Bill Yi
273e88795b
[automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12076516
Change-Id: I9d632bc674b89510499b86a30ed241111cad688e
2020-07-03 17:28:03 +00:00
Bill Yi
e16bac067b
[automerger skipped] Import translations. DO NOT MERGE am: 9dcae7e510 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12076516
Change-Id: I7bcedfb1cc46d6a36823803ce20e40cf69889c5a
2020-07-03 17:28:02 +00:00
Bill Yi
9dcae7e510
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3a787cd8d7e3b2900c18e6e53ab9e3f92ea4430a
2020-07-03 07:05:39 -07:00
Bill Yi
60f8b2d513
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I74345e5dabdde3467f04f047d9195a8cf17d03fe
2020-07-03 05:31:24 -07:00
vichang
bc7f639e15
Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663
Change-Id: I8e81b3d707bce016006bf0af1f75785ecd15648e
2020-07-02 10:50:06 +00:00
vichang
7485036f53
Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663
Change-Id: I745cd8bb0dc761d269e804ee871b249a157c4b6a
2020-07-02 10:38:54 +00:00
vichang
268371c44e
Merge "Move libcore.timezone to the i18n module - Final part"
2020-07-02 10:25:54 +00:00
Stanley Wang
61147df890
Fix the bug of showing the "Smooth display" item in the search result.
...
The controller can't be created when Settings Search gets the
non-indexable keys. So Settings Search can't get the correct value
from it.
The controller creates the Handler without the parameter in constructor
and causes the exception. It should use the main Looper of Context as
the parameter to create the Handler.
Fixes: 160179400
Test: run robotest and observe the search result
Change-Id: I6f9bf6de087ae776e8d531ff59d28966aee96b7b
2020-07-02 14:35:43 +08:00
Jason Chiu
ea689abbcd
Fix the exception of accessing an ArrayMap
...
- ArrayMap is not thread-safe.
- When accessing the map across threads at the same time, the map may
throw a ConcurrentModificationException.
- Convert the map to a synchronizedMap to avoid the exception.
Fixes: 159813482
Test: robotest
Change-Id: I3b8bdd435c7c546acf736fa8aafd2ceaed94d081
2020-07-01 10:42:25 +00:00
Zhen Zhang
222be02b34
Fix bug: "Hotspot & Tethering" preference doesn't get updated
...
Aissign the value of mPrefrence when displayPrefrence() being called.
This can fix the preference doesn't get updated bug. Added test to
ensure it.
Bug: 160169699
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AllInOneTetherPreferenceController
Change-Id: If0e7ce421cc46cff2b92837d2d07ea0ff4dc5fd9
2020-06-30 15:11:02 -07:00
Victor Chang
b07e53c1c8
Move libcore.timezone to the i18n module - Final part
...
Bug: 141747409
Test: atest CtsLibcoreTestCases CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
android-build-team Robot
f43b8f99eb
Snap for 6640159 from 5ff637fb1c to mainline-release
...
Change-Id: I0ace46f8f5875951aefe5a9886946d3f4b58cacc
2020-06-30 03:09:43 +00:00
Joshua Duong
5ff637fb1c
Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805
Change-Id: Ia093e4bf25f3cb00ac56e422c1e116899f96e0f2
2020-06-30 01:52:23 +00:00
Joshua Duong
ba1e9c30c4
Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805
Change-Id: Id03f133b8480af4f1febe9cbf7b9024896ba67b1
2020-06-30 01:52:18 +00:00
Joshua Duong
8776749e88
Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev
2020-06-30 01:41:14 +00:00
Lucas Dupin
8071001ecc
Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807
Change-Id: I56f45a5b566bb615b2a31772e6db169c656b8dc6
2020-06-29 18:48:43 +00:00
Lucas Dupin
1530c46690
Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807
Change-Id: Ie05cfa7cc0897e370c3ced865dceee0745b5533c
2020-06-29 18:48:39 +00:00
Lucas Dupin
837bda1f25
Merge "Change the order of dark theme options to match night light" into rvc-dev
2020-06-29 18:35:12 +00:00
Treehugger Robot
3947998755
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027
Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
2020-06-29 14:39:26 +00:00
Treehugger Robot
fce601ea2a
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027
Change-Id: Ia62597a163e529ef20e4136645709b0d300a4fc4
2020-06-29 14:28:03 +00:00
Treehugger Robot
b1cea4f1bc
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference"
2020-06-29 14:14:47 +00:00
LuK1337
ad243904db
Settings: Fix fallback summary for power_button_instantly_locks preference
...
* Using summary_placeholder instead of summary_empty
leaves an ugly empty space.
Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
TreeHugger Robot
d4bef905da
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12027836
Change-Id: Ief8836f5bf05a8a9bce22964ad2dbf8bf7fefdbf
2020-06-29 07:44:07 +00:00
TreeHugger Robot
d22c1f1552
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12027836
Change-Id: I3ef548599161e7a100dc6fdacc70ca877375e83c
2020-06-29 07:44:07 +00:00
TreeHugger Robot
f002dd72ac
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-29 07:24:13 +00:00
Bill Yi
45092142eb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ibfe2b145e92201622fda1d57bae726dd5d4e4eab
2020-06-28 22:35:46 -07:00
TreeHugger Robot
71e8ad086d
Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200
Change-Id: If748158226e436f716e1f651708fcca9486e62a4
2020-06-29 04:41:05 +00:00