TreeHugger Robot
11304fb8a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 17:50:47 +00:00
TreeHugger Robot
f87d5f6fc4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours am: bc565bd615
-s ours am: 7d16f97c97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: Id4da800bc0c5bd6b012a8b5e7e272918b2f879c7
2020-09-02 17:50:38 +00:00
TreeHugger Robot
7d16f97c97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours am: bc565bd615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: I79f5560d71e8830e434458ce0f70858c6e3935fb
2020-09-02 17:49:23 +00:00
TreeHugger Robot
2461dfd8a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours am: edb75a2eec
-s ours am: 4a3e39cb13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: If9082b0f69fb2eed9a93d1ba2b166d8f88614078
2020-09-02 17:49:20 +00:00
Anton Hansson
ac118415da
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours am: 633379f309
-s ours am: 0df917748c
-s ours am: 607d986e5e
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: I0f553a5ea9b4c9c1a76693e0d71d2a3c86d7bbae
2020-09-02 17:48:41 +00:00
TreeHugger Robot
bc565bd615
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: I1895d604f90e4f8d497c7d9dee89463efd531bda
2020-09-02 17:12:25 +00:00
Anton Hansson
607d986e5e
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours am: 633379f309
-s ours am: 0df917748c
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: Ifbbef7c60d34d86538fb65aad2aed3b2c7b3bdca
2020-09-02 17:11:38 +00:00
TreeHugger Robot
4a3e39cb13
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours am: edb75a2eec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: I0ec0fe0fa16a7ea6dd2768e16dc5b4c3f8a753f2
2020-09-02 16:36:19 +00:00
Anton Hansson
0df917748c
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours am: 633379f309
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: I861f802d5fef4c3ca7be53e9d1162c6482312324
2020-09-02 16:34:49 +00:00
TreeHugger Robot
74ab66f631
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 16:31:43 +00:00
TreeHugger Robot
edb75a2eec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: I3fcb638648ca92b1b363b77cc8ae4a04ea6268e2
2020-09-02 16:11:19 +00:00
TreeHugger Robot
11fd725f1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 16:06:50 +00:00
Anton Hansson
633379f309
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: I2d0f192fb7d7cbd5e60563375caab027489658f6
2020-09-02 16:00:11 +00:00
Anton Hansson
0e5e0c77d4
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
Bug: 167568930
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
2020-09-02 15:41:40 +00:00
Bill Yi
b9ff4275f3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I01190d1453f17ee5a42b303cfd201a4a8ed5a458
2020-09-02 13:28:38 +00:00
Bill Yi
25e90ee101
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6efada3aedd313f97b1405db8164499180316b89
2020-09-02 12:53:56 +00:00
Bill Yi
0009d56501
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I412e0c9881bc5de07ce964b2dc8892bb3e23db60
2020-09-02 12:17:48 +00:00
TreeHugger Robot
698b4eafa0
Merge "Set highest priority as default value to Bluetooth codec"
2020-09-02 10:14:55 +00:00
Hugh Chen
a6aae425bc
Fix settings crash
...
- This CL before, "Previously connected device" didn't
handle dock device. If user have disconnected dock
device will cause Settings crash.
This CL add condition to handle dock device to avoid crash.
- Update test case.
Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
2020-09-02 17:14:30 +08:00
Treehugger Robot
b802230a44
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours am: b372e3fbcf
-s ours am: 958cb755cf
-s ours am: 0b9ba3c3cd
-s ours am: 3b83a538df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: I7aa7dc84e31e224bf0c65b8deeeaf2219ecda33f
2020-09-02 08:50:21 +00:00
Treehugger Robot
a0503939be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours am: f3ae142f67
-s ours am: ca40ee1a3a
-s ours am: 8942b451cf
-s ours am: ecaded8c56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: Ib43b2ea507d77fed3878f01d00a0ba773bf7cb9b
2020-09-02 08:49:49 +00:00
Treehugger Robot
3b83a538df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours am: b372e3fbcf
-s ours am: 958cb755cf
-s ours am: 0b9ba3c3cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: I541dc626406cdff6a01bb3f16cf1c776373f5610
2020-09-02 08:12:20 +00:00
Treehugger Robot
ecaded8c56
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours am: f3ae142f67
-s ours am: ca40ee1a3a
-s ours am: 8942b451cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I051252acfcdfabf7964679838a347263855b5afb
2020-09-02 08:12:08 +00:00
Treehugger Robot
0b9ba3c3cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours am: b372e3fbcf
-s ours am: 958cb755cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: Ib131571114f795322d115a1926b8e4920968f8e2
2020-09-02 07:48:42 +00:00
Treehugger Robot
8942b451cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours am: f3ae142f67
-s ours am: ca40ee1a3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I086d2a926c9089f19e9bf5a26e04a8e6210afd92
2020-09-02 07:48:23 +00:00
Treehugger Robot
958cb755cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours am: b372e3fbcf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: Ie0228bd344d0b755ccc745109a2369331d15b622
2020-09-02 07:29:52 +00:00
Treehugger Robot
ca40ee1a3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours am: f3ae142f67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I7e811f65e77821275c46b300115828a56583611f
2020-09-02 07:29:37 +00:00
Treehugger Robot
b372e3fbcf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: I94bcd92bbc7c3476585bad6fc1334130dcebae56
2020-09-02 07:11:35 +00:00
Treehugger Robot
f3ae142f67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417623
Change-Id: I41cca1a0a56dc19ae68b420aadc78e3cfc3121c9
2020-09-02 07:11:06 +00:00
Treehugger Robot
76947837c5
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-02 06:35:32 +00:00
Treehugger Robot
22a9ba1458
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
2020-09-02 05:42:17 +00:00
Bill Yi
256ea9e29b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15697e753d245ca812bd2cba4d174c54811bde91
2020-09-02 05:05:27 +00:00
Xin Li
8d2e3b2009
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558
-s ours am: d92daf10ef
-s ours am: 744507f78b
-s ours am: e32ed22547
-s ours
...
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180
Change-Id: Ia5f0f1a1143e1533eb997d4cf1ba771e11b207a1
2020-09-02 01:59:32 +00:00
Xin Li
e32ed22547
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558
-s ours am: d92daf10ef
-s ours am: 744507f78b
-s ours
...
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180
Change-Id: I880a3e8ae1c028d809e951de0eeaa59cf8fa3723
2020-09-01 22:10:06 +00:00
Xin Li
744507f78b
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558
-s ours am: d92daf10ef
-s ours
...
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180
Change-Id: I96cb62de1d30aed204295f417deab1d806bda62e
2020-09-01 21:46:50 +00:00
Xin Li
d92daf10ef
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558
-s ours
...
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180
Change-Id: I0d548c1b5c061e4ee753808040af883dd59cb3ee
2020-09-01 20:37:15 +00:00
Xin Li
d57e13f558
Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master
2020-09-01 20:04:34 +00:00
timhypeng
ce4dfc5c04
Set highest priority as default value to Bluetooth codec
...
-To set highest priority when codec modification comes from development setting
Bug: 165442632
Test: make -j42 RunSettingsRoboTests
Change-Id: I8cfbaa276f3b3e269f4a80e8aae987fbb90f646e
2020-09-01 15:28:59 +08:00
TreeHugger Robot
3a64d5898b
Merge "Fix cast volume control bar not work"
2020-09-01 06:53:15 +00:00
TreeHugger Robot
30397a0a9c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-01 06:06:09 +00:00
SongFerng Wang
36c1271234
Merge "Add NR network type to "Global" mode preference" am: 19222f2154
am: 318f6bcc53
am: 4e657741ae
am: 08e3e22ae0
am: d57b551b8d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568
Change-Id: I516b59a022ab7d6d092191ee225ce99515fecda4
2020-09-01 06:04:49 +00:00
SongFerng Wang
d57b551b8d
Merge "Add NR network type to "Global" mode preference" am: 19222f2154
am: 318f6bcc53
am: 4e657741ae
am: 08e3e22ae0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568
Change-Id: I4d22338c155adcb13a916d9a689685eb3caad04b
2020-09-01 05:46:53 +00:00
SongFerng Wang
08e3e22ae0
Merge "Add NR network type to "Global" mode preference" am: 19222f2154
am: 318f6bcc53
am: 4e657741ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568
Change-Id: I2852e9c06cedb61338e6ccaaed078fc07e241a61
2020-09-01 05:00:04 +00:00
SongFerng Wang
4e657741ae
Merge "Add NR network type to "Global" mode preference" am: 19222f2154
am: 318f6bcc53
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568
Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63
2020-09-01 04:40:24 +00:00
SongFerng Wang
318f6bcc53
Merge "Add NR network type to "Global" mode preference" am: 19222f2154
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568
Change-Id: I1714b765690ac43e77233752d31ef921219584f0
2020-09-01 04:27:11 +00:00
SongFerng Wang
19222f2154
Merge "Add NR network type to "Global" mode preference"
2020-09-01 04:09:35 +00:00
Bill Yi
ea6acdd60a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274
-s ours am: 2237c26d0a
-s ours am: 343820d45c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12494205
Change-Id: I86f1831ec6d6025a43327986976611159ee4d394
2020-08-31 16:50:46 +00:00
Bill Yi
343820d45c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274
-s ours am: 2237c26d0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12494205
Change-Id: I2f9763daa31f92ad9f5b44b70add6d104dfe8bef
2020-08-31 16:41:47 +00:00
Bill Yi
cf1ce08bfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274
-s ours am: b7e58c608f
-s ours am: ab4566a889
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12494205
Change-Id: I858bf2ef9fcfd49639e6dc1f9561a709917e3b7e
2020-08-31 16:18:39 +00:00