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
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
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
2f32da41ba
Show all devices, including connected ones, into "Previously connected" page
...
-Add connected devices in "Previously connected" page
-Set active when clicking a connected device
Bug: 147150246
Test: make -j50 RunSettingsRoboTests
Change-Id: I4422cd63c360a4387cedc4f80f34474b42f82a1f
(cherry picked from commit 9743fed57d
)
2020-09-01 07:52:16 +00:00
timhypeng
44cc57cd9d
Display "pair new" only when local output device is available.
...
-If media app does not support cast->phone transferring, local output
audio device is unavailable. "pair new" is for Bluetooth which should be
also unavilable.
-These types are local output audio devices:
TYPE_BUILTIN_SPEAKER
TYPE_WIRED_HEADSET
TYPE_WIRED_HEADPHONES
TYPE_USB_DEVICE
TYPE_USB_HEADSET
TYPE_USB_ACCESSORY
TYPE_DOCK
TYPE_HDMI
Bug: 163095048
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib844c7546e1946cb87fac04cb8b2b8f4acf06451
(cherry picked from commit 113ac8102a
)
2020-09-01 07:48:28 +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
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
ab4566a889
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274
-s ours am: b7e58c608f
-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: I7f146486d561d1b05208dbeba2e81829dfca2bb2
2020-08-31 16:12:52 +00:00
Bill Yi
2237c26d0a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274
-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: Id7673649ab84ae3507e9d55acdfff4d84661d901
2020-08-31 15:47:23 +00:00
Bill Yi
94734fdd58
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 361d4a214c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12494211
Change-Id: Iad265cf241d09152390251328e2025e35965581a
2020-08-31 15:26:25 +00:00
Bill Yi
b7e58c608f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274
-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: I4249bd150a1c76528ad511c9b8954debac3857d4
2020-08-31 15:26:21 +00:00
Bill Yi
361d4a214c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icde96a03193c5c91d61dd9354bc4c34d8b53e5be
2020-08-31 13:49:23 +00:00
Bill Yi
09cc09a274
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idc7c40c329d18ea4bd4061eb37b4672b71a2ce17
2020-08-31 13:11:17 +00:00
Xin Li
748efff856
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
2020-08-28 23:35:54 -07:00
SongFerngWang
34f35aff90
Fix NullPointerException, TelephonyManager.getServiceState is null am: a12327b5f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12468773
Change-Id: I5baab79d81bd127d8bf1a5092c0821a576b21852
2020-08-28 10:35:58 +00:00
SongFerngWang
a12327b5f3
Fix NullPointerException, TelephonyManager.getServiceState is null
...
Add the null protect for TelephonyManager.getServiceState.
Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
2020-08-28 09:11:03 +00:00
Arc Wang
20680c254c
[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route
...
This change shows Pie+x Wi-Fi icon in Wi-Fi Details for a connected Wi-Fi
network which is not the default network when
1. It's connection speed quality is bad.
or
2. It has certain internet connection problem.
Bug: 163627176
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
manual visual
Change-Id: I1f102471426a55c7dabd9110afba20f802abedbe
2020-08-28 11:43:55 +08:00
Avinash Nalluri
e4956322e8
Add NR network type to "Global" mode preference
...
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
2020-08-27 15:56:13 -07:00
TreeHugger Robot
bc4f38d322
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12446577
Change-Id: I5cc5e7850459c371cbbc2ff65a3d4a13997fdeac
2020-08-26 03:53:39 +00:00
TreeHugger Robot
9a728641e3
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-08-26 03:02:50 +00:00
TreeHugger Robot
98dd4491b7
Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582
Change-Id: I84db13dbe58d05cb8639515e302b927c00342662
2020-08-25 18:58:11 +00:00
TreeHugger Robot
794482fb92
Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev
2020-08-25 18:14:50 +00:00
Bill Yi
c451cf2466
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I671b84326cfd203176121627a567768f51f32524
2020-08-25 08:57:10 -07:00
TreeHugger Robot
887b09614d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 66f3b09eab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: I2ffcf3962bcc223d5ee056f8f2b3e8a47964ba70
2020-08-25 01:58:10 +00:00
TreeHugger Robot
2a5cdaa51b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 10dd2553f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: If33ef43e82404e5fa5ae2a970d8e21d3b0fec7a3
2020-08-25 00:50:57 +00:00
TreeHugger Robot
66f3b09eab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: Ib5a7bb2bed92ff6a85e04007ed1ca44dfd87ef2a
2020-08-25 00:50:50 +00:00
TreeHugger Robot
5a3f9c7700
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437626
Change-Id: Ifab410adba669f1f5be3858cad4fb63c2245fa36
2020-08-25 00:50:46 +00:00
TreeHugger Robot
10dd2553f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: Ie8e590ce674ad98870db8b7ec424e79aed1e5646
2020-08-25 00:50:44 +00:00