Commit Graph

27473 Commits

Author SHA1 Message Date
Chen Xu
04bcf7ec6c Merge "move CellBroadcastMessage from telephony-common to app"
am: 12a7368ad2

Change-Id: Idf2a9f4fd6c184a9aebef3e2e9298fcaeeecc9da
2019-10-25 10:44:44 -07:00
Chen Xu
12a7368ad2 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Aaron Huang
7b82097220 Merge "Replace getNetworkPrefixLength() with public API"
am: f67076dad5

Change-Id: Id37dd5521b1f95f7431d63e18dea3f8cc2b80eee
2019-10-24 22:36:15 -07:00
Aaron Huang
f67076dad5 Merge "Replace getNetworkPrefixLength() with public API" 2019-10-25 05:15:16 +00:00
Raff Tsai
81e9c58691 Merge "Skip loading contextual cards if legacy cards are used"
am: c53771e80a

Change-Id: Idae5d4948edc9767afae23f2fcbbd522410654b5
2019-10-24 18:51:50 -07:00
Raff Tsai
c53771e80a Merge "Skip loading contextual cards if legacy cards are used" 2019-10-25 01:35:20 +00:00
Aaron Huang
9251280615 Replace getNetworkPrefixLength() with public API
Use public API getPrefixLength() instead

Test: build pass

Change-Id: Ib85aa12dc22ac5b03c9bb7101beaf340014eb4fd
2019-10-24 10:51:53 +00:00
Lucas Lin
5eda5a3e7f Merge "Improve the wifi description for the case of private DNS broken"
am: 37b17ae752

Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-23 02:52:01 -07:00
Lucas Lin
37b17ae752 Merge "Improve the wifi description for the case of private DNS broken" 2019-10-23 09:20:09 +00:00
Daniel Hunt
dfd5e4fed5 Skip loading contextual cards if legacy cards are used
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,

Bug: 142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
2019-10-20 15:46:39 +00:00
Chen Xu
24a72eb92a move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
(cherry picked from commit 86a8e9b627)
Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
2019-10-20 04:05:06 +00: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
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
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
lucaslin
570f7dbc4b Improve the wifi description for the case of private DNS broken
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.

Bug: 113242081
Test: make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest

Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
2019-09-26 15:55:01 +08: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
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
8d8c3e19b5 Merge "Enable dismissal feature on legacy suggestions."
am: ee39335edc

Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
2019-09-22 20:03:21 -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
b83ddefb5c Merge "Remove use of deprecated Time class"
am: b3f8696c4d

Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
2019-09-17 09:56:45 -07: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
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
Taesu Lee
39e4fbb746 Fix to show eUICC preference in eng build
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.

Test: Manual and make RunSettingsRoboTests

Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-09-06 16:11:39 +09:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Kevin Chyn
645480a4e4 Merge "Remove attention controller" into qt-r1-dev
am: 41aafab963

Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
2019-08-19 19:57:37 -07:00
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
Kevin Chyn
d1e331dbcd Merge "Remove delay from enroll start button" into qt-r1-dev
am: ca2bbdfeca

Change-Id: Ide066e65d76c70175ade9ebeaf94e471cb11c806
2019-08-19 15:09:00 -07:00
Kevin Chyn
ca2bbdfeca Merge "Remove delay from enroll start button" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Arc Wang
0e53b6293d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
2019-08-17 07:18:03 -07:00
Kevin Chyn
058af41a42 Remove delay from enroll start button
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Arc Wang
91200e610d [Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.

This fix check the setting of active subscription and shows the preference.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab Remove attention controller
Bug: 139484065

Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Jordan Liu
028f2c87a1 Merge "Allow radio info on phones with no subscription" am: 19d1f890a0 am: b377a593b7
am: 1fc63fc444

Change-Id: I114db364c10315dca50b75270fc14da7eaf1d354
2019-08-13 19:01:30 -07:00
Jordan Liu
1fc63fc444 Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
am: b377a593b7

Change-Id: Ibe68e60583fdf2bd08d6d8f62b5c942878dd160e
2019-08-13 18:48:49 -07:00
Jordan Liu
b377a593b7 Merge "Allow radio info on phones with no subscription"
am: 19d1f890a0

Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05
2019-08-13 18:37:15 -07:00
Jordan Liu
655c1be579 Allow radio info on phones with no subscription
Some info is still helpful for debugging in these cases.

Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
Christine Franks
caebfbe9c9 [DO NOT MERGE] Update title for null uri when setting changes
am: ea14373666

Change-Id: I8f542126d98beefe8f221266b7f25bc9d7b0f4d5
2019-08-04 00:55:33 -07:00
Christine Franks
37b38f872f Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev 2019-08-03 14:47:40 +00:00
Christine Franks
ea14373666 [DO NOT MERGE] Update title for null uri when setting changes
Currently, the title will not update at all if set to silent.

Bug: 130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
2019-08-03 01:00:31 +00:00
Edgar Wang
3448917d8e Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 2019-08-02 05:38:23 +00:00