Commit Graph

27627 Commits

Author SHA1 Message Date
Raff Tsai
5d0c49e9ef Merge "Fix Battery page animation" into qt-qpr1-dev
am: 8b348f1f30

Change-Id: I922be1ac21e17c9ae71d7721401a08bbd56ca020
2019-11-04 22:15:20 -08:00
TreeHugger Robot
8b348f1f30 Merge "Fix Battery page animation" into qt-qpr1-dev 2019-11-05 05:34:41 +00:00
Raff Tsai
6a3433b67a Fix Battery page animation
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.

Fixes: 139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
(cherry picked from commit 648ada031d)
Merged-In: I167ac87c9bd83035e00d4991961599e76f4f69e1
2019-11-05 12:11:51 +08:00
Kevin Chyn
ca51533d56 Merge "Revert "Remove attention controller"" into qt-qpr1-dev
am: 1876b8c6dd

Change-Id: I5282deec73015da2920c0b429e1e23c5f97d4fbe
2019-11-01 10:06:20 -07:00
Kevin Chyn
eac6fcff2d Revert "Remove attention controller"
Bug: 142979808

This reverts commit 8e1d1ca3ab.

Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
2019-10-31 20:50:35 +00:00
LuK1337
9a07055546 Merge "Settings: Fix QrCamera crash on devices without flash" am: 68ddb3afdb
am: 748ee1657f

Change-Id: Ic64d2c3a36939751891440639b5114a9df3fd184
2019-10-29 23:56:00 -07:00
LuK1337
b056ea70f0 Settings: Fix QrCamera crash on devices without flash
Change-Id: Ife34b5fb87a9a4f509b665a3433e0b2ba857c885
2019-10-30 02:45:08 +00:00
Raff Tsai
54ef0fcbc0 Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2 am: 447674e100
am: 4cbb60c344

Change-Id: I2c4a9774c2ae463ed80810dc95a298e1302f4b5f
2019-10-29 10:24:05 -07:00
Raff Tsai
4cbb60c344 Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2
am: 447674e100

Change-Id: I9680dc02dc96fc324b019c027d08271fb27b4506
2019-10-29 10:19:05 -07:00
Raff Tsai
0e40f46fe2 Merge "Settings: Respect preference's visibility in VideoPreferenceController" 2019-10-29 16:39:13 +00:00
LuK1337
9c3ab97182 Settings: Respect preference's visibility in VideoPreferenceController
* Since AbstractPreferenceController's displayPreference()
  sets the visibility based on isAvailable() we need to
  set mVideoPreference early and make getAvailabilityStatus()
  return UNSUPPORTED_ON_DEVICE if needed.

Test: manual, open battery manager
Change-Id: Ibf72971b49fa1162fb99f9fc61cbb54ba39a2dfa
2019-10-29 15:39:27 +01:00
Josh Hou
0fe6fc26ad Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2
am: 03c9ec1223

Change-Id: I8dc1754d631ac16a99e1c92776a2756ca5b8269e
2019-10-28 05:43:11 -07:00
Josh Hou
03c9ec1223 Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053
am: e8a6c02fd2

Change-Id: I1823e81857f95d7bcd6c1d5e7d840900b38c9d2d
2019-10-28 05:37:47 -07:00
Josh Hou
e2cdd74174 Fix ViLTE is not available when WiFi Calling is disabled
Bug: 141831293
Test: 1. Set carrier config carrier_wfc_ims_available_bool to false,
then verify Wi-Fi calling option is not shown.
      2. Set carrier config carrier_vt_available_bool to false, then
      verify video calling option is not shown.
      3. Set both carrier_wfc_ims_available_bool and
      carrier_vt_available_bool to false, then verify calling category
      is not shown.

Change-Id: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
Merged-In: Ibec13fbeb5acf1d62342286687b2ba969beb4e14
2019-10-28 11:12:49 +00:00
Xin Li
e2c2504c94 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:30 +00:00
Chen Xu
b5443d9d45 Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2 am: 04bcf7ec6c
am: 67f5eb6746

Change-Id: I0c18d41d6a3052585403e24090feb84c8f1a967f
2019-10-25 11:22:08 -07:00
Chen Xu
67f5eb6746 Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2
am: 04bcf7ec6c

Change-Id: I4cb440a59d5f6de5815b8ee942b3f29d2a770d4b
2019-10-25 11:09:18 -07:00
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
Xin Li
52bb254eea Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-25 10:28:05 -07:00
Aaron Huang
9c39357454 Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 am: 7b82097220
am: 5b182f20cb

Change-Id: Ib6f188586b486fa5af0a8df57a65db654f66e311
2019-10-24 22:49:20 -07:00
Aaron Huang
5b182f20cb Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5
am: 7b82097220

Change-Id: I0e948700ba76f81db98628f35313dd11ff45df98
2019-10-24 22:42:42 -07: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
6f99052cbc Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691
am: 9dbbf88d14

Change-Id: I52f7724fc50af20888d31821dc56732186a07c84
2019-10-24 19:08:08 -07:00
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
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
06b7986eff Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f
am: 9b29332cd3

Change-Id: I3cd916c67afaebfd62863301eca5f6aeb8b0d1c5
2019-10-23 03:20:15 -07: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
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
Yi-Ling Chuang
e87289bbc4 Merge "Fix non responding slice toggling problem." into qt-qpr1-dev
am: 5956f903cb

Change-Id: I2235eeb55d9ebcaaac399956d854471779c23b31
2019-10-16 21:09:58 -07:00
TreeHugger Robot
5956f903cb Merge "Fix non responding slice toggling problem." into qt-qpr1-dev 2019-10-17 01:32:14 +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
SongFerngWang
a72e1c4612 Preferred network list add 5G item
am: dd7f9b57f6

Change-Id: I70f89c6c5e5c43107788c58f1fc3ca44383b4ce5
2019-10-06 09:20:09 -07:00
SongFerngWang
ffc927f77d RadioInfo network mode list and network mode string add 5G
am: ec384c2f6f

Change-Id: I280fb1f3e0acddcb3a85eee876112e491bd4f8f4
2019-10-06 09:20:06 -07:00
Yi-Ling Chuang
f8eb30800a Fix non responding slice toggling problem.
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.

Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to prevent from
getting PendingIntent.CancelExcpetion from SliceActionView when toggling
slices.

Note that this change would only apply on Wifi, MobileData, Flashlight
and Bluetooth Slices.

Bug: 140719905
Test: rebuild and switch toggles
Change-Id: Iddbb16ddcbcf97b6f6e680b43645c04fbc061f39
2019-10-04 17:17:19 +08:00
SongFerngWang
dd7f9b57f6 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
2019-10-04 04:53:31 +00:00