Xin Li
c789e737f8
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
...
am: acfebe21ac
Change-Id: Ic67eed1985854f82ea33c59d88589cad46deda29
2019-10-15 10:11:14 -07:00
Xin Li
acfebe21ac
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
...
Bug: 141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471
2019-10-14 22:54:19 +00:00
SongFerng Wang
9507e5f2f9
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32
...
am: 951e9b7742
Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17
2019-10-14 00:39:16 -07:00
SongFerngWang
24b3051e9b
Preferred network list add 5G item am: 76422cab68
...
am: 10d41f52b7
Change-Id: I3356ff24d7d8669aae438bdccab9bccce5d3e295
2019-10-14 00:39:09 -07:00
SongFerngWang
fae02cf405
RadioInfo network mode list and network mode string add 5G am: dc5149efef
...
am: 8cd10f774d
Change-Id: I3d2f8561ebb74cb5bb73ad2cc65b4d0df3454851
2019-10-14 00:39:02 -07:00
Bonian Chen
ef55302465
[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e
...
am: b36ff74ac3
-s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1 128de7bdb6
is in history
Change-Id: Ieff603d09fc5be1a2439eb5674c1aad25751779f
2019-10-14 00:38:54 -07:00
Antony Sargent
5a4c8856bc
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am: aa88b8cee6
-s ours
...
am: 0f1b14e467
-s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608
is in history
Change-Id: Ic86a69026cb7db7049519aae4ee0367a13cf4c9a
2019-10-14 00:38:46 -07:00
SongFerng Wang
951e9b7742
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
...
am: bc6a65ca32
Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
2019-10-14 00:34:20 -07:00
SongFerngWang
10d41f52b7
Preferred network list add 5G item
...
am: 76422cab68
Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
2019-10-14 00:34:10 -07:00
SongFerngWang
8cd10f774d
RadioInfo network mode list and network mode string add 5G
...
am: dc5149efef
Change-Id: Id55735d6933965735249e6c25981c137877b00ed
2019-10-14 00:33:54 -07:00
Bonian Chen
b36ff74ac3
[Settings] hide preferred network mode UI
...
am: 92eb42c69e
Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc
2019-10-14 00:33:34 -07:00
Antony Sargent
0f1b14e467
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes
...
am: aa88b8cee6
-s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608
is in history
Change-Id: Ieb25eb9b4d1c9d85bcaa6e0532f8814339070f4c
2019-10-14 00:33:09 -07:00
SongFerng Wang
bc6a65ca32
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
...
* changes:
String "CDME" is wrong
Preferred network list add 5G item
RadioInfo network mode list and network mode string add 5G
[Settings] hide preferred network mode UI
Make EnabledNetworkModePreferenceController listen to setting changes
2019-10-14 07:14:54 +00:00
SongFerngWang
7fa128edcd
String "CDME" is wrong
...
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
2019-10-14 05:01:18 +00:00
SongFerngWang
76422cab68
Preferred network list add 5G item
...
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.
Bug: 138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass
Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
Merged-In: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
2019-10-14 05:01:09 +00:00
SongFerngWang
dc5149efef
RadioInfo network mode list and network mode string add 5G
...
Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
2019-10-14 05:01:01 +00:00
Bonian Chen
92eb42c69e
[Settings] hide preferred network mode UI
...
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.
Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
atest EnabledNetworkModePreferenceControllerTest
Manual with AT&T SIM card in out of servce and in service
Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-10-14 05:00:52 +00:00
Antony Sargent
aa88b8cee6
Make EnabledNetworkModePreferenceController listen to setting changes
...
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-10-14 04:59:03 +00:00
Bill Yi
165a3e6152
[automerger skipped] Import translations. DO NOT MERGE
...
am: aa605a2ff8
-s ours
am skip reason: subject contains skip directive
Change-Id: I8582fd40ccfab6c247144759b8eac47e021b3ee4
2019-10-06 15:03:16 -07:00
Bill Yi
aa605a2ff8
Import translations. DO NOT MERGE
...
Change-Id: I1af1cc81e5fffb4ead2146f8871efa5115f91be2
Auto-generated-cl: translation import
2019-10-06 07:36:10 -07:00
Paul Hu
a6dadc465b
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7
...
am: 3a728ae13b
Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
2019-10-01 03:09:15 -07:00
Paul Hu
3a728ae13b
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
...
am: a67ca4cfd7
Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
2019-10-01 03:03:36 -07:00
Paul Hu
a67ca4cfd7
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
2019-10-01 09:50:28 +00:00
Taesu Lee
c4c8f51bb0
Merge "Fix to show eUICC preference in eng build" am: e825c30137
...
am: 9e81a2f4a8
Change-Id: I777273344c8eb4f791756be7fcb9755a5bf9e8b8
2019-09-25 23:21:12 -07:00
Taesu Lee
9e81a2f4a8
Merge "Fix to show eUICC preference in eng build"
...
am: e825c30137
Change-Id: Ie6ca5a575e5c5caa4c841286421d037649765397
2019-09-25 23:14:10 -07:00
Treehugger Robot
e825c30137
Merge "Fix to show eUICC preference in eng build"
2019-09-26 05:53:10 +00:00
Bill Yi
444eac4f4a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 500e7b2b71
-s ours
am skip reason: subject contains skip directive
Change-Id: I4a84a614577ee9558b05de1e30fe543ff2ece1d3
2019-09-25 07:30:56 -07:00
Bill Yi
500e7b2b71
Import translations. DO NOT MERGE
...
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
2019-09-24 18:54:26 -07:00
Daniel Huang
1fec213233
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530
...
am: f28625bcf1
Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
2019-09-24 02:39:02 -07:00
Daniel Huang
f28625bcf1
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
...
am: 51cb777530
Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
2019-09-24 02:32:29 -07:00
Daniel Huang
51cb777530
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
2019-09-24 09:21:51 +00:00
Yi-Ling Chuang
b26711944b
Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc
...
am: 8d8c3e19b5
Change-Id: I8fae05f98c2ad04e0d7fba7a2aa409c08f781c0b
2019-09-22 20:09:51 -07:00
Yi-Ling Chuang
8d8c3e19b5
Merge "Enable dismissal feature on legacy suggestions."
...
am: ee39335edc
Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
2019-09-22 20:03:21 -07:00
Treehugger Robot
ee39335edc
Merge "Enable dismissal feature on legacy suggestions."
2019-09-23 02:45:25 +00:00
Bill Yi
cbfc75bb00
[automerger skipped] Import translations. DO NOT MERGE
...
am: 73915b77ed
-s ours
am skip reason: subject contains skip directive
Change-Id: I31f45d935e2c9a13feb71186730b99fffc102c9b
2019-09-22 12:53:43 -07:00
Bill Yi
73915b77ed
Import translations. DO NOT MERGE
...
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
2019-09-22 07:38:24 -07:00
Yi-Ling Chuang
83ac0efd81
Enable dismissal feature on legacy suggestions.
...
Add back the close button for legacy suggestions.
Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
2019-09-20 18:03:10 -07:00
苗苗 (Miao Miao)
9f4a65c893
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
...
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
2019-09-20 18:13:30 +08:00
Neil Fuller
42b55bc6f6
Merge "Remove use of deprecated Time class" am: b3f8696c4d
...
am: b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
2019-09-17 09:56:45 -07:00
Treehugger Robot
b3f8696c4d
Merge "Remove use of deprecated Time class"
2019-09-17 16:32:47 +00:00
Neil Fuller
4c77d00e34
Remove use of deprecated Time class
...
Remove a use of the deprecated Time class.
Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
2019-09-17 13:53:17 +01:00
Bill Yi
edbddf7f42
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
2019-09-12 17:28:33 -07:00
Bill Yi
86dfbd6254
Import translations. DO NOT MERGE
...
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
2019-09-12 15:54:53 -07:00
paulhu
52d24750a4
[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
...
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.
Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
2019-09-12 17:21:43 +08:00
Bill Yi
e6107df474
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8173de150d
-s ours
am skip reason: subject contains skip directive
Change-Id: I010ba47035a6530ec5d50abd363a6ea013515551
2019-09-11 22:50:29 -07:00
Bill Yi
8173de150d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
2019-09-11 19:10:50 -07:00
Xin Li
827172cee1
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: aac7f8e2cd
-s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1 7195e05dfa
is in history
Change-Id: I7826eee6fd99a83bf4e8a96bb51f0622fbdf84c3
2019-09-11 14:09:27 -07:00
Bill Yi
73a98df64b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 09c08d1da0
-s ours
am skip reason: subject contains skip directive
Change-Id: I8a743a33b14e424069a75ac9d590ffca287300f1
2019-09-11 12:03:01 -07:00
TreeHugger Robot
09c08d1da0
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-09-11 18:41:53 +00:00