Commit Graph

6929 Commits

Author SHA1 Message Date
Fan Zhang
44931d1e96 Properly suppress zen mode entry from soundsetting page.
Change-Id: If2c033232b05753f3ba52bb986dd6c85cab6e452
Fixes: 72748524
Test: robotests
2018-06-05 15:10:45 -07:00
Fan Zhang
752350c8d8 Suppress prevent ringer gesture parent page in search.
The full page verion of prevent ringing is still searchable.

- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
  override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.

Fixes: 72748524
Test: existing robotests for PreventRingingPreferenceController

Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
2018-06-05 15:10:45 -07:00
TreeHugger Robot
60f2f06855 Merge "Don't crash on null Intent in FingerprintEnrollFindSensor" 2018-06-05 19:52:53 +00:00
TreeHugger Robot
4d142c992b Merge "Add null check in displayPreference" 2018-06-05 18:14:17 +00:00
Beverly
b77145401f Add null check in displayPreference
Change-Id: I3afaa3f587dc5c9989d5e520f1c8a0b33e57ec7d
Fixes: 109740402
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-06-05 13:05:12 -04:00
TreeHugger Robot
1db4027355 Merge "Revert "Settings: Add logical camera default switch"" into pi-dev 2018-06-04 20:45:51 +00:00
Shuzhen Wang
8f9fc06a18 Revert "Settings: Add logical camera default switch"
This reverts commit a9578a2b8a.

Test: Build
Bug: 80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-06-04 17:37:25 +00:00
TreeHugger Robot
04af70a604 Merge "Revert "Settings: Add logical camera default switch"" 2018-06-04 17:35:57 +00:00
TreeHugger Robot
e763ebcba1 Merge "Add Wifi calling Preference slice and other cleanup" 2018-06-01 22:32:11 +00:00
TreeHugger Robot
4661045f2c Merge "Add Slices for Enhanced 4G LTE" 2018-06-01 21:28:11 +00:00
TreeHugger Robot
b6ce6d3663 Merge "Removed guest user access to Tap & Pay via Search." 2018-06-01 19:06:39 +00:00
Naina Nalluri
6b1869351a Add Wifi calling Preference slice and other cleanup
WifiCallingPreference Slice Provider:
  1. If Wifi calling is not enabled - display message to user
     to enable Wifi calling
  2. Else if Wifi preference is not editable - return a null
     Slice
  3. Else provide a slice with rows - first row giving current pref
     information, followed by preference items (in each row).
     wifi_only is displayed only when it is allowed to display it.
     Each row with preference item has specific intent action.
WifiCallingPreference Slice BroadcastReceiver:
   1. If only Wifi calling is enabled & Wifi preference is editable &
      there is a change in current value modify wifi pref setting
   2. And Ask to re-query the slice in one second to display
      updated settings if 1 is valid or display appropriate message.
Clean-up:
   1. Return null instead of non-actionable slices.
   2. Use getText to get string resources.
   3. Remove unnecessary extra variables.

Bug: 79548264
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I186f19be2007c2331eaf6195e70b4a9c635adf9e
2018-06-01 11:02:59 -07:00
Andre Garivay
6d48242da7 Removed guest user access to Tap & Pay via Search.
Gathered user info to verify that user is not a guest. If user is a
guest (and only a guest: other alternate users may use the feature),
they are not allowed to load the nfc_payment_settings xml file.

Change-Id: I5700b9cd4b639b031b6d464827d16f4ea4cfa03f
Fixes: 80111261
Test: Robotests
2018-06-01 09:57:23 -07:00
TreeHugger Robot
eec3faea44 Merge "Fix null pointer in StarredContactsPrefController" 2018-06-01 12:07:30 +00:00
Ryan Lin
1e7e455495 Merge "Handle Bluetooth is not supported on emulator" into pi-dev am: 942b07da93
am: 15eb7fe8c4

Change-Id: I515f9679afa7962fda4f2d04392007d201468070
2018-05-31 22:41:53 -07:00
Ryan Lin
942b07da93 Merge "Handle Bluetooth is not supported on emulator" into pi-dev 2018-05-31 23:22:30 +00:00
Matthew Fritze
adff8a2643 Merge "Make Settings Slider Slices one row" into pi-dev am: 4199198ec2
am: 2c7fe6f8ea

Change-Id: I0910df206d702cc348371c57da27ddf698faa6ff
2018-05-31 15:38:17 -07:00
Shuzhen Wang
6cd426482e Revert "Settings: Add logical camera default switch"
This reverts commit 5aab8d9ee1.

Reason for revert: This setting is for internal QC purpose only
Bug: 80007047

Change-Id: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-05-31 22:29:29 +00:00
Beverly
1aa6826e80 Fix null pointer in StarredContactsPrefController
Change-Id: I9b2209825b30a6cc8dfe355632201b8082572dbb
Fixes: 80084826
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-05-31 17:29:08 -04:00
Antony Sargent
9ceb587ede Don't crash on null Intent in FingerprintEnrollFindSensor
During a run of the setup wizard, a tester one time encountered a case
where the 'Accept Legal terms' screen followed by the Security screen
showed for a second time after already confirming the pattern in the
Security screen. The logs showed a crash in
FingerprintEnrollFindSensor.onActivityResult which could only have
happened if it was called with a requestCode of CONFIRM_REQUEST and a
resultCode of RESULT_OK, but a null Intent.

This isn't an expected flow, and AFAIK we haven't been able to reproduce
the original problem, but it seems reasonable to at least not crash in
settings, so this CL defends against that crash by just calling finish()
in this case, which means the caller who started the
FingerprintEnrollFindSensor will see the default result code of
Activity.RESULT_CANCELLED.

Bug: 80099085
Test: make -j RunSettingsRoboTests
Change-Id: I94401eabe295e4d5396cf7d324fbf1902dc45f6d
2018-05-31 14:22:38 -07:00
Josh Hou
606222da7f Add Slices for Enhanced 4G LTE
Add Slices for Enhanced 4G LTE
Enhanced 4G LTE Slice Provider:
Create slice to display appropriate message with further instructions
Enhanced 4G LTE Slice Broadcast Reciver:
1. Change the setting via ImsManager
2. Ask to requery the slice in one second to display updated settings if 1 is valid or display appropriate message

Bug: 79270171
Test: Robotests
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I48d412de94d5d9f1ad42a299691ec5cf8001c6a1
2018-05-31 10:34:00 -07:00
TreeHugger Robot
4199198ec2 Merge "Make Settings Slider Slices one row" into pi-dev 2018-05-31 16:03:25 +00:00
TreeHugger Robot
e68598380e Merge "Shown toast when BT turned on" 2018-05-31 07:00:27 +00:00
ryanywlin
d67314e771 Handle Bluetooth is not supported on emulator
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42

Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
2018-05-31 12:48:13 +08:00
Weien Wang
31f17d88d0 Merge "Fix the battery icon on the battery page when low battery" 2018-05-31 04:37:05 +00:00
hughchen
3051845840 Shown toast when BT turned on
* Shown "Bluetooth turned on" toast only when BT turned on in "Pair new device"
* Add test to verify shown toast function can be called when BT turned on.

Bug: 79383997
Test: make -j42 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I25f75aaa04063d9ef8a0df4bb06aeaa70d7ac146
2018-05-31 11:03:37 +08:00
TreeHugger Robot
32f70ecd95 Merge "Use settingslib shadows in Settings robotest" 2018-05-30 23:00:20 +00:00
Matthew Fritze
93307cdb69 Make Settings Slider Slices one row
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.

Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
2018-05-30 15:39:43 -07:00
Fan Zhang
6fc7ebd72b Use settingslib shadows in Settings robotest
Change-Id: Ieae5d65bb5efdbc4c91455d1f722e84fe9e60116
Fixes: 80428049
Test: robotest
2018-05-30 14:36:26 -07:00
TreeHugger Robot
2c032fdd19 Merge "Stop using AppState for app icon in DomainAppPreference." 2018-05-30 20:31:54 +00:00
TreeHugger Robot
ad90960b6e Merge "delete DeviceInfoSettings and activity, pref xml" 2018-05-30 20:14:50 +00:00
Fan Zhang
179f537173 Stop using AppState for app icon in DomainAppPreference.
Change-Id: I080ed9d2d7d70c092bec54ed4e4b6bb2b6c8f453
Fixes: 77967533
Test: robotest
2018-05-30 12:33:26 -07:00
TreeHugger Robot
50437769a2 Merge "Skip device index job if caller is not Settings app." 2018-05-30 18:40:21 +00:00
Fan Zhang
74ba1a51d7 Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Test: robotests
2018-05-30 10:38:58 -07:00
TreeHugger Robot
cf2e1fd593 Merge "Plumb context object to PowerWhitelistBackend." into pi-dev 2018-05-30 03:08:20 +00:00
Ivan Chiang
c6d7191cb9 Fix gray out previously connected device preference issue
Count the dock devices in previously connected device controller.

Change-Id: I08d82ec715698ecf894a4a7cd0631c5f1de0f591
Fix: 80227045
Test: m -j SettingsRoboTests RunSettingsRoboTests
2018-05-30 02:45:47 +00:00
TreeHugger Robot
6e06da361a Merge "Plumb context object to PowerWhitelistBackend." 2018-05-30 01:50:40 +00:00
TreeHugger Robot
3a05544d34 Merge "Misc fixes for Settings" 2018-05-30 00:26:48 +00:00
TreeHugger Robot
ce7d1ab3bb Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev 2018-05-30 00:18:45 +00:00
Fan Zhang
3489f65024 Plumb context object to PowerWhitelistBackend.
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:33:01 +00:00
Fan Zhang
7e395e1a00 Plumb context object to PowerWhitelistBackend.
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:32:22 +00:00
Fan Zhang
9ab2f37226 Prevent disabling default phone/sms apps in battery setting
- In handleDisableable(), call getKeepEnabledPackages() in the same way
  as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
  app packages.

Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:25:56 +00:00
Fan Zhang
b70b11e02b Prevent disabling default phone/sms apps in battery setting
- In handleDisableable(), call getKeepEnabledPackages() in the same way
  as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
  app packages.

Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Bug: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:21:24 +00:00
Fan Zhang
8379a09554 Misc fixes for Settings
- Add some precautious logging in RoundedHomepageIcon in case b/79841665
  comes back.
- Hide memory setting from app info page.

Change-Id: I37d090504ab25854e1278aa3a6d3e85781f394b1
Fixes: 79841665
Fixes: 80140797
Test: visual
2018-05-29 13:56:43 -07:00
Matthew Fritze
58019a84ed Merge "Fix bluetooth search result no-op" into pi-dev am: f14bfcbfa6
am: 9cb3dd123d

Change-Id: Ib35794ec9c9e71c53145f418629287fd72d9adc6
2018-05-29 12:56:44 -07:00
Fan Zhang
0b5f345e87 Merge "Fix a bug where device index is not skipped correct." into pi-dev am: 75b3e6f302
am: 9bc1f54268

Change-Id: Id2979eaf1f08bd2c67bd6bba31a62eb5d0acf8e2
2018-05-29 12:53:47 -07:00
Matthew Fritze
111fc0344b Merge "Fix DND crash from SpringboardActivity" into pi-dev am: 3f790b76b0
am: 7fcbaf4ac9

Change-Id: I999288a61ebc780986ed108cd0b255db6ee4d791
2018-05-29 12:52:43 -07:00
TreeHugger Robot
f14bfcbfa6 Merge "Fix bluetooth search result no-op" into pi-dev 2018-05-29 19:40:14 +00:00
TreeHugger Robot
75b3e6f302 Merge "Fix a bug where device index is not skipped correct." into pi-dev 2018-05-29 18:48:24 +00:00
TreeHugger Robot
3f790b76b0 Merge "Fix DND crash from SpringboardActivity" into pi-dev 2018-05-29 18:47:23 +00:00