Bill Yi
cd282d2f47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12199710
Change-Id: I6e3e30c796380b104bffd9e627231fa76eb6f8d8
2020-07-21 19:29:08 +00:00
Anton Hansson
40a8846e54
Add explicit dep on framework-wifi.impl
...
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.
Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Merged-In: I800b434c8049121db115cff87d51e164e4529999
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
2020-07-21 10:18:51 +01:00
Anton Hansson
d3c9df3e7e
Add explicit dep on ims-common
...
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.
Bug: 157451444
Test: m RunSettingsRoboTests
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
2020-07-21 10:18:39 +01:00
Treehugger Robot
f876f3d0cc
Merge "Fix mvno data field summary not update issue" am: 4615179fc5
am: 36c9ca1f2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: I21df066581d1f2a43b693026a7a389da81922f05
2020-07-21 07:12:31 +00:00
Treehugger Robot
36c9ca1f2c
Merge "Fix mvno data field summary not update issue" am: 4615179fc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603
Change-Id: Idf9f8b66f9b65f4118b8b2abd32eca2a076aea79
2020-07-21 06:58:14 +00:00
Treehugger Robot
4615179fc5
Merge "Fix mvno data field summary not update issue"
2020-07-21 06:44:08 +00:00
Bill Yi
708e1e4f9e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I71c7609f5c78b3042c980428f08dbe0eb6db5b67
2020-07-20 21:45:04 -07:00
Neil Fuller
173a7e73b3
Merge "Track core platform API change" am: 1d45573eb2
am: 83d7191a22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed
2020-07-20 15:07:02 +00:00
Neil Fuller
83d7191a22
Merge "Track core platform API change" am: 1d45573eb2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136
Change-Id: Ib891567707808332c1fda6228fbb191b13f7df38
2020-07-20 14:45:41 +00:00
Neil Fuller
1d45573eb2
Merge "Track core platform API change"
2020-07-20 14:39:35 +00:00
Neil Fuller
d1c4ea906f
Track core platform API change
...
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.
Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
2020-07-20 11:26:14 +01:00
TreeHugger Robot
733eed05c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12185729
Change-Id: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
2020-07-18 22:30:28 +00:00
TreeHugger Robot
a118c94070
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev
2020-07-18 22:14:24 +00:00
Bill Yi
504c673017
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5aefe4449fb12bc20991bc9f55da58264b9bb72
2020-07-18 01:41:07 -07:00
TreeHugger Robot
2101d1230a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345
Change-Id: Ic225851e46b0907dcb136e74b46b09c01e3b0b8c
2020-07-18 01:01:32 +00:00
TreeHugger Robot
8469a447c0
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev
2020-07-18 00:49:01 +00:00
Treehugger Robot
b66acd05db
[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours
...
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: I0b5fe9de55e71422abb8f82fb6ca85c5d627b123
2020-07-17 18:48:00 +00:00
Treehugger Robot
df7e42a213
Merge "Remove NR NSA from voice network type" am: 46a50b35be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930
Change-Id: Ic9f0a1b78d4bd5321dbc8ab814246d62d419a563
2020-07-17 18:16:14 +00:00
Treehugger Robot
46a50b35be
Merge "Remove NR NSA from voice network type"
2020-07-17 17:57:43 +00:00
Bill Yi
706bd58d00
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic3517eef64e0f59a1f7f46d3138e3898a62eb7b9
2020-07-17 08:35:46 -07:00
Treehugger Robot
3330abffe8
[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
am: 73a28754f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I1dd28625768cf364bbaee112a8b2ad4a767cb556
2020-07-17 09:01:21 +00:00
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
Treehugger Robot
73a28754f1
Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I5c4f7993abf41fbbefca12962061451345c2e62e
2020-07-17 08:43:40 +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
Treehugger Robot
01ec6774e6
Merge "[DO NOT MERGE] Rollup Cert-related changes from R"
2020-07-17 08:28: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