Commit Graph

27484 Commits

Author SHA1 Message Date
Raff Tsai
9dbbf88d14 Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a
am: 81e9c58691

Change-Id: I09b7f37f094c24144b0448f2e7f820cffd5ddadd
2019-10-24 18:58:01 -07: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
Lucas Lin
9b29332cd3 Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752
am: 5eda5a3e7f

Change-Id: Idd568b71dab954a6b018594e15d3f695ea2aeac2
2019-10-23 03:07:20 -07: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
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
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
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
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
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
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
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
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
joshmccloskey
349e664035 Merge "Change cancel button type to skip for SUW" into qt-r1-dev
am: ff01d52d50

Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a
2019-09-09 23:20:15 -07:00
TreeHugger Robot
ff01d52d50 Merge "Change cancel button type to skip for SUW" into qt-r1-dev 2019-09-10 06:02:39 +00:00
joshmccloskey
d98257bae6 Change cancel button type to skip for SUW
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes: 140702414

Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
2019-09-09 16:46:03 -07: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
Joshua Mccloskey
820c723e59 Merge "Modified text to cancel enrollment" into qt-r1-dev
am: fde49ec3ad

Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
2019-09-05 15:59:59 -07:00
Joshua Mccloskey
fde49ec3ad Merge "Modified text to cancel enrollment" into qt-r1-dev 2019-09-05 22:44:12 +00:00
joshmccloskey
a55cbf036f Modified text to cancel enrollment
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
Jayachandran Chinnakkannu
b5617b6f21 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am: 7afb9854a7

Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
2019-08-23 20:36:56 -07: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
Bonian Chen
128de7bdb6 [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
2019-08-22 14:36:12 -07: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