TreeHugger Robot
9af1becfce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070
-s ours am: c8cff2628f
-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: Id714265422fcd526946b6dffc65fd18bf117866d
2020-07-18 22:45:37 +00: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
c8cff2628f
[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: I34932052aef59e637a60d74efeb1db6cfc807e77
2020-07-18 22:30:16 +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
Automerger Merge Worker
432af91964
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-s ours" into rvc-d1-dev-plus-aosp
2020-07-18 01:19:55 +00:00
TreeHugger Robot
8817099bae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: de0205d7f0
-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: I6a1b3dbf3c42eafdab788412813eb27d074abd5c
2020-07-18 01:19:47 +00:00
TreeHugger Robot
881b14a74d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0
-s ours am: 2101d1230a
-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: Ia405f34b2e478d1c6e8f45b6c8d9642e094691ca
2020-07-18 01:19:46 +00: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
de0205d7f0
[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: Ie466ac7c553b4b8a520b4be13c2b8df2400b0f82
2020-07-18 01:01:29 +00:00
TreeHugger Robot
32b64b4a8b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867
Change-Id: I8682ed0e9f836c5038299f34b936499e3e18404e
2020-07-18 00:49:23 +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
ef58f37dca
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-07-18 00:29:52 +00:00
Treehugger Robot
a2bc9a8afe
[automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be
am: df7e42a213
-s ours am: b66acd05db
-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: I6192eb9b471ae807ad24f4ec99755a098090188d
2020-07-17 19:13:31 +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
c2c8b6b7a7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d84173a559cb2a949aba1bc28ef7d98d3f32baf
2020-07-17 10:47:34 -07: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
f85f6c82db
[automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
am: 73a28754f1
-s ours am: 3330abffe8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: I145f9155dcffa50cf8decb7a73b81417385a1c01
2020-07-17 09:19:16 +00:00
Eran Messeri
7e539d9aa0
[automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
am: 091c73f768
-s ours am: f853d0fd25
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547
Change-Id: Ib08fb1393f61909b0bec7a72258e90f575e95164
2020-07-17 09:19:13 +00: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
András Klöczl
5f1984a185
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 62f8eba220
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: I5c3c52b369634f0fd531eabc23397033c1ec2919
2020-07-15 14:19:56 +00:00
András Klöczl
3bc6e61a44
Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
am: 850263d0c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073
Change-Id: Ibc484a119111a84ac0fc6d9ab2b0ab42062fe71d
2020-07-15 14:19:30 +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
850263d0c6
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: I149473b03717cdbb10aede744e00e34f813b44ac
2020-07-15 14:03:57 +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
697f0fc11d
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: d3265e35db
-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: Ib535f86258804daf779ed6267509978332564780
2020-07-14 16:19:23 +00:00
Bill Yi
0e7fdac130
[automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c
-s ours am: 35632cb1c2
-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: I2689b64d28c8959cf3f61d31ebca5bdcb610a6ea
2020-07-14 16:05:02 +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
Bill Yi
182290e9b8
[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941
Change-Id: If81c15739006a0e476938a21e5739163f07ad565
2020-07-14 16:04:50 +00:00
Bill Yi
35632cb1c2
[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: Id35fed36fc4331df55138a82a2f4ead80d7c5d4a
2020-07-14 16:04:49 +00:00
Sunny Shao
9e4c753b30
Enable the filterTouchesWhenObscured in Special app access
...
- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access
Bug: 155288585
Test: make RunSettingsRoboTests
Merged-In: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
Merged-In: I0731057ec6e77c6a0867784c729c3f5812ef6170
Change-Id: I02c372423287366d0706bcdf7cdecff48db2e22a
2020-07-14 15:06:26 +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
a58e5de4c9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3d7b397ba8a39c5f6a7ac75e0fa505be39b48775
2020-07-14 04:13:50 -07: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
Sunny Shao
573599b628
Enable the filterTouchesWhenObscured in Special app access
...
- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access
Bug: 155288585
Test: make RunSettingsRoboTests
Merged-In: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
Merged-In: I85842db3faa558ea61bc878ca76ff6d8ce1a4b03
Change-Id: Id873bab7312226a9ea642a6241249c6754059a0b
2020-07-14 07:00:43 +00:00
Sunny Shao
5d73464b76
Enable the filterTouchesWhenObscured in Special app access
...
- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access
Bug: 155288585
Test: make RunSettingsRoboTests
Merged-In: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
Merged-In: I0731057ec6e77c6a0867784c729c3f5812ef6170
Change-Id: I0731057ec6e77c6a0867784c729c3f5812ef6170
2020-07-14 13:40:51 +08:00
Sunny Shao
c9dff4b097
Enable the filterTouchesWhenObscured in Special app access
...
- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access
Bug: 155288585
Test: make RunSettingsRoboTests
Merged-In: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
Change-Id: I0731057ec6e77c6a0867784c729c3f5812ef6170
2020-07-14 10:27:20 +08:00
Automerger Merge Worker
b1a75b7f66
Merge "Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56" into rvc-d1-dev-plus-aosp
2020-07-13 17:14:03 +00:00
Lucas Dupin
162d505e14
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 91ba077612
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Iebc0844230afdb44868f4f1a6245808aee291dfb
2020-07-13 17:13:42 +00:00
Lucas Dupin
b0f831f3e5
Merge "Delete media feature flag" into rvc-dev am: 9b01b8510a
am: 03edb83f56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108974
Change-Id: Iaaeaf39246920eb1abc651247f5cd8b5787b7d2e
2020-07-13 17:13:32 +00:00
Lucas Dupin
03edb83f56
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: I4fc62150f05b1d59bcd77fe7566dd334f1d8931d
2020-07-13 16:55:39 +00: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