Eran Messeri
f853d0fd25
[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ida2e692c72cd1c79d95ae6b0e99196d05fa843e0
2020-07-17 09:01:18 +00:00
Eran Messeri
091c73f768
[DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ie170b54b9b15d3abff3ec883d943d597b3719a77
2020-07-17 08:43:38 +00:00
Eran Messeri
f37c8cb4f7
[DO NOT MERGE] Rollup Cert-related changes from R
...
This change includes the following commits from internal R branch
which are related to certificate management:
0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings
Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
András Klöczl
62f8eba220
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I74c9bb596375c68bf414f208d8ad4b6058cf4d37
2020-07-15 14:04:09 +00:00
András Klöczl
15d9351ba0
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev
2020-07-15 13:50:34 +00:00
Bill Yi
d3265e35db
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777
Change-Id: Id91d7e77943acb2d0b08d64615b20da8577ecf83
2020-07-14 16:04:59 +00:00
Andras Kloczl
57154fbac3
Fix multi user crash when Add guest was tapped multiple times
...
When "Add guest" got tapped multiple times then the first click starts
the guest creation process which blocks the UI thread for around 2-3
seconds, then triggers the open guest details intent, and the second
tap event starts another guest creation, but it fails (since there
can't be more than 1 guest on the device) and returns null, and in the
openUserDetails we get NullPointerException.
Test: manual test
Video: http://shortn/_i4Dce33yhl
Bug: 160267016
Change-Id: I9a4f0a91295e336d246abe5f5470682a14cb510f
2020-07-14 14:34:57 +01:00
Bill Yi
2532f0b32c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d
2020-07-14 02:03:30 -07:00
Lucas Dupin
91ba077612
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Ie6859a17ba1f1d420f231ba6d9385a48ce442923
2020-07-13 16:55:38 +00:00
Lucas Dupin
9b01b8510a
Merge "Delete media feature flag" into rvc-dev
2020-07-13 16:44:15 +00:00
Bill Yi
24cc569d89
[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12129920
Change-Id: Ibd646f2fa23c55d1a293ef33766e536952cae5ed
2020-07-10 20:55:54 +00:00
Bill Yi
d7102ca072
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I1857033f45c9da5e4cc646d0e3f0afdc295cd71a
2020-07-10 11:54:14 -07:00
Sunny Shao
1c7d1dfba6
Fix toggle widget can be switched under overlapped view am: 4794b798c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12124562
Change-Id: I7d6b33b80c948337b1526fd0becfbe87d535895b
2020-07-10 07:09:48 +00:00
Sunny Shao
4794b798c4
Fix toggle widget can be switched under overlapped view
...
- ag/11612781 added filterTouchesWhenObscured to toggle widget
can't prevent the click behavior pass through the overlapped view.
- Due to click events was handled by SwitchPreference instead of the
toggle widget.
- Enable the filterTouchesWhenObscured attribute on all
SwitchPreferences in all pages of the special app access.
Bug: 155288585
Test: manual test
Here is the test steps
1.Create an overlapped view's app and launch it to overlap the
other apps.
2.Launch Settings
3.Goto Apps & notification > Advanced > Special app access
4.Click any toggle under Special app access to monitor it can be
switched or not. It must be not switched.
Change-Id: I9c9cf4719153292ed03f55a6eb9d3a308677aee3
2020-07-10 06:11:24 +00:00
Lucas Dupin
42219fb395
Delete media feature flag
...
The feature will always be available, even for users who disabled it
on Beta 1.
Bug: 160826507
Test: manual
Test: MediaControlsParentPreferenceControllerTest
Test: MediaControlsPreferenceControllerTest
Change-Id: Ia2835e7c8156d753a8f8fbf248f2509003309fd2
2020-07-09 11:57:27 -07:00
TreeHugger Robot
b45f7f11ad
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d3767 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12111797
Change-Id: I259e276344d338e617d76ec2eee2ce83c99193e9
2020-07-09 00:51:37 +00:00
TreeHugger Robot
ce1c1d3767
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-07-09 00:44:15 +00:00
Bill Yi
042f3d1bf5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I060d248cade273ee2298f9bac0b95ab64aed1689
2020-07-08 15:15:50 -07:00
TreeHugger Robot
ba3131d923
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev am: 28a5c00429
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042286
Change-Id: I5a022bd9d9b9485f9caf10c42f7146d35660da0a
2020-07-08 18:22:18 +00:00
TreeHugger Robot
28a5c00429
Merge "Guard against SecurityException of accessing to slice uri" into rvc-dev
2020-07-08 18:09:09 +00:00
Jason Chiu
eaf1564d9f
Guard against SecurityException of accessing to slice uri
...
- Sometimes unregistering a Slice callback will have no permission to
unpin the Slice uri and throw an exception.
- Guard against the exception as the first solution.
Bug: 159722324
Test: robotest
Change-Id: Ic227331fef64c3fa6fe3e4442fba2a9b754d520d
2020-07-08 11:28:33 +00:00
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
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
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
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
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
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
Bill Yi
2a483616ec
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I366c375aa973a601c98395d6052e1bcb42b69e8c
2020-07-03 19:09:34 -07: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
9dcae7e510
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3a787cd8d7e3b2900c18e6e53ab9e3f92ea4430a
2020-07-03 07:05:39 -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
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
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