Commit Graph

34727 Commits

Author SHA1 Message Date
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
SongFerng Wang
ac58388986 Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" 2020-08-28 09:10:01 +00:00
SongFerngWang
09dc253a47 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
2020-08-28 14:59:00 +08: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
Colin Cross
38fa185a27 Revert "Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7..."
Revert "Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528460c8b..."

Revert "Snap for 6793014 from a43295d1825da62af038d345a7a861ed7a..."

Revert "Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb386109..."

Revert "Snap for 6793014 from d0e31526c62b2aeb35c293ac96feb180fc..."

Revert "Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376efabd2..."

Revert "Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293b79684..."

Revert "Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57a8e7d5..."

Revert "Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aad87a67..."

Revert "Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24af9964..."

Revert "Snap for 6793014 from 14cb57e107a3abce8b14937b1f92c28d18..."

Revert "Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc03a606..."

Revert "Snap for 6793014 from 8c65adad0bcdfb3acc561063b4048dca24..."

Revert "Snap for 6793014 from b3061942700265e2bf04af9997775dcbbb..."

Revert "Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd0ac3be..."

Revert "Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec70d8da6..."

Revert "Snap for 6793014 from 988d4244914e0c749655e8cb6db18ba44f..."

Revert submission 12465146-release-request-6b259cbc-1f45-4b05-bc7e-c9b893b79d68-for-git_main-busytown-release-6793014

Reason for revert: b/166531456
Reverted Changes:
I5ff7a6c0d:Snap for 6793014 from f2989f9c65556d5155dbd57f82f0...
I77bdff943:Snap for 6793014 from a43295d1825da62af038d345a7a8...
I2ac5c520a:Snap for 6793014 from c3f124cca05579acf0a6cb589ebd...
I023b9702f:Snap for 6793014 from 98756d6d3e2bb0ba28eb125caa7a...
Ibc7893d72:Snap for 6793014 from fd1ad6750ef332d3f50f218f4d5d...
Ic27847bee:Snap for 6793014 from 8c65adad0bcdfb3acc561063b404...
If20bc9352:Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376...
I6542d17e8:Snap for 6793014 from 3777d883a3857b1a1589181c436d...
I66e6bb8a9:Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab12...
I3cd190b6b:Snap for 6793014 from 424180bdc4aa18249e678daebfd0...
If92db7402:Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc...
Iaced03c87:Snap for 6793014 from d0e31526c62b2aeb35c293ac96fe...
I5d28c6b4b:Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aa...
I30d07bea3:Snap for 6793014 from 7594ec6384c4da320726def34f47...
I473205f48:Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd...
I0656b41af:Snap for 6793014 from 44725f06b7f7d6407b5ee82d989b...
I0f9796067:Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec7...
I9a38cda8f:Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb...
I876a82f51:Snap for 6793014 from 11467102abddb6026aaa164c1361...
I749d7d023:Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293...
I038daea41:Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24...
I47aa3131c:Snap for 6793014 from 14cb57e107a3abce8b14937b1f92...
I32dba8a95:Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528...
I2ebc9f9db:Snap for 6793014 from 988d4244914e0c749655e8cb6db1...
Iae7c3370f:Snap for 6793014 from 9ffb8852294e06e2d387dc1fb868...
I6467a7f1b:Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57...
I8c6375203:Snap for 6793014 from b3061942700265e2bf04af999777...
I843b2e1f3:Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5...
Ie254f7079:Snap for 6793014 from f22ad3164937a8f2e309965c102b...
I01e0974ed:Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c42...

Change-Id: Ie8b2b332f7ebaaee7cd39c6f94d280c047426bc9
2020-08-27 04:12:26 +00:00
TreeHugger Robot
3777d883a3 Merge "Show just disconnected device on previously connected" 2020-08-26 14:50:45 +00:00
Hugh Chen
386df49bbc Show just disconnected device on previously connected
- This CL before, previously connected devices will show most
  recently connected devices and the maximum is 3.
  In this time, if next most recently connected device is disconnected.
  It's will not show on "previously connected devices", user needs go to
  "see all" page to found that device.
  This CL add rule to compare the priority of most recently connected
  device. If priority of next disconnected device is higher than
  currnect devices that on "previously connected devices".
  Let next disconnected device show on "previously connected devices".
- Update test case.

Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I684501a20a67755b2196ba9d4b5565add01a5d01
2020-08-26 18:56:30 +08:00
Hugh Chen
432d0737e0 Stop the ringtone when other seek bar is adjust
- Stop the ringtone when other seek bar is adjust.
- Add test to verify when onStartTrackingTouch() is called,
  will call stopSample().

Bug: 80194851
Test: make -j42 RunSettingsRoboTests
Change-Id: I2300f0f56340c3698f62cc911bda7b7a94d23a7a
2020-08-26 14:49:06 +08: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
Jeff DeCew
9e1d9c40d8 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." 2020-08-25 14:00:04 +00:00
Jeff DeCew
b409b64045 Update NotificationChannelSettings Preferences in place to prevent re-layout.
Fixes: 110093185
Test: ChannelListPreferenceControllerTest
Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f
2020-08-24 15:11:22 -04:00
TreeHugger Robot
6a23ee5d37 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062

Change-Id: Ib275c7ce10f274d815a155cf9d95af03757e1a7c
2020-08-24 16:05:10 +00:00
Julia Reynolds
aee17d0f0b Merge "Fix pending intent links" into rvc-qpr-dev am: 3e29b54e5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416202

Change-Id: Ia5b32ae76df267b8d08dd8947c02180ead620a78
2020-08-24 16:04:05 +00:00
TreeHugger Robot
b75d2f6009 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev 2020-08-24 15:47:38 +00:00
TreeHugger Robot
96b2d774fb Merge "Add 'Adaptive connectivity' UI" 2020-08-24 14:19:01 +00:00
jasonwshsu
2d5fb75aca Add magnification switch shortcut dialog.
* show dialog when triple-tap users want to use magnify window mode

Bug: 146473544
Test: manual
Change-Id: I6915c165e8da59c6ec7557147192c7a1e9e19cf3
2020-08-24 10:15:25 +00:00
Arc Wang
71a25ea64f Add 'Adaptive connectivity' UI
'Adaptive connectivity' toggle button controls whether
network connection is automatically managed.

Bug: 162871294
Test: make RunSettingsRoboTests
      manual
      Switch the toggle button and reboot device, observe
      if the state is retained.
Change-Id: I4499a3639abab356e8faa6316bfa45541efd63ac
2020-08-21 17:17:02 +08:00
Arc Wang
e4ba98cebe Add 'Adaptive connectivity' UI
'Adaptive connectivity' toggle button controls whether
network connection is automatically managed.

Bug: 162871294
Test: make RunSettingsRoboTests
      manual
      Switch the toggle button and reboot device, observe
      if the state is retained.
Change-Id: I4499a3639abab356e8faa6316bfa45541efd63ac
Merged-In: I4499a3639abab356e8faa6316bfa45541efd63ac
2020-08-21 16:44:06 +08:00
TreeHugger Robot
4acf477987 Merge "Add null check" 2020-08-21 05:22:17 +00:00
jasonwshsu
7b11b33518 Fix 'Settings' entry is disappear from 'Magnification'
Bug: 165787919
Test: manual
Change-Id: I11a0c2ad7898d40caa5ad76a43f430ead82c3b80
2020-08-20 17:43:36 +00:00
Lyn Han
aea66dcc96 Hide conversation bubble switch if app bubbles are off
Fixes: 159340745

Test: BubblePreferenceControllerTest

Test: priority conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle checked
=> app bubbles ON => toggle checked

Test: default/silent conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle NOT checked
=> app bubbles ON => toggle NOT checked

Change-Id: Ia5759c2a06c1da4d84b3dafed95e52c3aa30ad56
(cherry picked from commit 9af95dae7d)
2020-08-20 16:59:33 +00:00
Julia Reynolds
4cf561d2c3 Fix pending intent links
Test: manual
Fixes: 154795795
Change-Id: Ia870bd0bfd90be852121b542100806cac5bac881
(cherry picked from commit 97894bcfb7)
2020-08-20 12:38:37 +00:00
Kevin Chyn
54a5f51dba Merge "Update settings together with frameworks/base" 2020-08-19 22:33:04 +00:00
Treehugger Robot
aa6fd24c45 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c am: ece108cc9a am: f00eba5b87
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I151077343415ebc89c7b2dd084586e038d0ebaf1
2020-08-19 15:41:28 +00:00
Treehugger Robot
f00eba5b87 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c am: ece108cc9a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: If651cf8cbf4649931d7dd1daf5fb86c466f3d449
2020-08-19 15:30:09 +00:00
Treehugger Robot
ece108cc9a Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I7912e42f3ddc32e6470790b97c983b561906ffaf
2020-08-19 15:18:31 +00:00
Treehugger Robot
af6dfc4b8c Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
2020-08-19 15:08:01 +00:00
Treehugger Robot
16503cf517 Merge "Settings: Fix exception in about phone during SIM swap" 2020-08-19 14:47:21 +00:00
Julia Reynolds
f253250883 Add null check
Test: manual
Fixes: 161386023
Change-Id: Id4b3de8fd87f6c809dfcc18630af21fe0609c3e0
2020-08-19 09:45:00 -04:00
PETER LIANG
f92160da4a Merge changes from topic "color_correction_b_148785841"
* changes:
  Fix the screen will move by itself when enabled Color correction.
  Refine and migrate the functions that related to update preference into the specific lifecycle.
2020-08-19 07:51:41 +00:00
Jason Hsu
f164cf8539 Merge "Fix checkbox in magnification mode dialog does not have ripple effect" 2020-08-19 04:57:20 +00:00
Peter_Liang
896e18012d Fix the screen will move by itself when enabled Color correction.
Root Cause:
Using the listener to update the UI dynamically might have some time delay.

Solution:
Refactor to another implementation and avoid using the listener to update it.

Additional condition:
Add height restriction in preference to avoid the palette view to cover whole screen.

Bug: 148785841
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PaletteListPreferenceTest
Change-Id: I6a854e16321b3426e2f8ff65c6404036d55caed4
2020-08-19 11:59:59 +08:00
TreeHugger Robot
e9c717b6c6 Merge "Add Panic button sound preference to panic gesture settings page." 2020-08-19 02:01:06 +00:00
Julia Reynolds
a09121353d Merge "Don't put a null in a spannablestringbuilder" 2020-08-18 18:48:28 +00:00
Fan Zhang
67d3454265 Add Panic button sound preference to panic gesture settings page.
Also renamed emergency_sos_* to panic_*. "emergency sos" is used by
other OEMs.

https://screenshot.googleplex.com/66097f3e-6aa0-4e2f-afb8-22f278bb0ed7.png

Bug: 161394591
Test: robotests
Change-Id: I14a59399fe7192d305d89a86dc93380c1e4c8a1c
2020-08-18 09:19:33 -07:00
Beth Thibodeau
ee7da79fbf Allow user to block individual apps from resuming. am: 48ce5892e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392268

Change-Id: I131ff7c33871d858a63824fc17ba168ba590f6e2
2020-08-18 14:39:26 +00:00
hoffc
291fd9b816 Settings: Fix exception in about phone during SIM swap
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.

Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.

Bug: 159410236

Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
2020-08-18 13:57:55 +08:00
TreeHugger Robot
d453134ac1 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 am: e87f0d9fa2 am: ef7b3433a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: I1ae5cd31a99659d6240c756cc88601185c40b25b
2020-08-17 20:40:17 +00:00
TreeHugger Robot
ef7b3433a9 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2 am: e87f0d9fa2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: Ib289fc74a560a02b2d925c8b941c8cc7a04f5d7f
2020-08-17 20:38:28 +00:00
TreeHugger Robot
e87f0d9fa2 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 60e33309b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12374931

Change-Id: I13794e6cf89c14ea1ebd5a2751e4590f4b7f4c01
2020-08-17 20:25:53 +00:00
Julia Reynolds
7afb1d7a2b Don't put a null in a spannablestringbuilder
Test: manual
Fixes: 162869220
Change-Id: Iad00ab417edf2dd5d1b83194c6ade2899fd1350c
2020-08-17 12:10:44 -04:00
Beth Thibodeau
48ce5892e8 Allow user to block individual apps from resuming.
This adds a new section to the media controls settings screen with a
list of apps that could potentially be used for resumption. If an app is
toggled off it will be added to a list of apps which will not persist in
QS, even when resumption is on.

Also updated the strings on this setting page to match UX
recommendation, so the default toggle state is now on.

Bug: 161813143
Bug: 159852516
Test: manual
Test: atest SettingsProviderTests
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="ResumableMedia"
Change-Id: Id3de52419ffba233469396dd47439428201e5e00
Merged-In: Id3de52419ffba233469396dd47439428201e5e00
2020-08-17 15:47:04 +00:00
jasonwshsu
62dc1b6364 Fix checkbox in magnification mode dialog does not have ripple effect
* Move onClickListener to LinearLayout since checkbox has null background in xml
* Rewrite setTextAreasClickListener logic to fit the need: at least one
checkbox need to be checked, and to let talkback announce disabled when
view is really in disabled state.

Bug: 164343865
Test: manual test
Change-Id: Ia5a831febc41f01858908cbdc365cf9a6a1282e3
2020-08-17 17:27:49 +08:00
Kevin Chyn
202494365c Update settings together with frameworks/base
LockSettingsService returns a handle to the gatekeeper password
instead of the password itself now. As such, update areas of code
accordingly.

Bug: 161765592

Test: RunSettingsRoboTests

Run the following on face/fingerprint devices
Test: Remove credential
      adb shell am start -a android.app.action.SET_NEW_PASSWORD
      Set up credential + fingerprint
Test: Remove credential,
      adb shell am start -a android.settings.FINGERPRINT_SETTINGS
      This tests the ChooseLock* logic in FingerprintSettings
Test: Set up credential,
      adb shell am start -a android.settings.FINGERPRINT_SETTINGS
      This tests the ConfirmLock* logic in FingerprintSettings
Test: Remove device credential, enroll fingerprint/face. Succeeds.
      This tests the ChooseLock* returning SP path from
      BiometricEnrollIntro
Test: With credential and fingerprint/face enrolled, go to
      fingerprint/face settings and enroll. This tests the
      ConfirmLock* path in Fingerprint/FaceSettings
Test: Remove device credential, enroll credential-only, enroll
      fingerprint/face separately. Succeeds. This tests the
      ConfirmLock* returning SP path in BiometricEnrollIntro
Test: In SUW, set up credential, then biometric. This tests
      the ChooseLock* path in SUW
Test: In SUW, set up credential, go back, then set up biometric.
      This tests the ConfirmLock* path in SUW

Change-Id: Ibc71ec88f8192620d041bfd125f400371708b296
2020-08-16 12:38:27 -07:00
Kevin Chyn
9ce9d3d539 Update biometric onChallengeGenerated with frameworks/base
Bug: 145978626
Test: Builds

Change-Id: If02497fa6462f1ff263aeb96cf0beed014fee328
2020-08-16 11:48:13 -07:00
Jiashen Wang
8e939b0dfc Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63 am: e50cda81df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I549082280f8b9a49f75333f9327b92ea679caa61
2020-08-15 13:03:32 +00:00
Jiashen Wang
4d00b8b57a Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: I987fd968ff755e88942bd69409b59996a08c972a
2020-08-15 12:53:07 +00:00
Jiashen Wang
e50cda81df Adding dialogs to warn users about the potential eSIM erase failure am: bbcd54dd63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12379093

Change-Id: Id36dbea5606b1775c83b3d6a53880a5f60ab715b
2020-08-15 12:52:55 +00:00
Jiashen Wang
bbcd54dd63 Adding dialogs to warn users about the potential eSIM erase failure
eUICC card could potential in the card error state and all the eSIM
operations will fail which could be fixed by a reboot. Thus, we need to
pop up a dialog to inform users that their eSIM profiles cannot be
erased successfully.

Bug: 163078560
Test: Manually tested by mocking the eUICC card error state.
Mock: https://docs.google.com/presentation/d/1AVNXxPbieTX1KmoewG4mo3xWPnEZyba_h9rPcwHHcr8/edit#slide=id.p

Change-Id: I102fb2de889e08554f525f2cbe1528bb9a37afd7
2020-08-15 05:31:49 +00:00