Commit Graph

1751 Commits

Author SHA1 Message Date
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
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
Matthew Fritze
a559103b1b Fix DND crash from SpringboardActivity
Special case Uris need to explicitly add their intents.
This unfortunately duplicates a list of special-cased Slices,
but I have attached a bug with a plan to address this duplicity in Q.

Change-Id: I346915c32543713d33716422018d7c950cce323d
Fixes: 80065409
Test: atest SliceDeepLinkSpringBoardTest
2018-05-25 13:35:23 -07:00
Daichi Ueura
cbd04dcade Merge "Hide entire hidden field for non-hidden networks" into pi-dev am: 2c793dfeff
am: 1a2153e6ab

Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
2018-05-23 16:05:02 -07:00
TreeHugger Robot
2c793dfeff Merge "Hide entire hidden field for non-hidden networks" into pi-dev 2018-05-23 18:15:04 +00:00
TreeHugger Robot
c7b90ee998 Merge "Return null when setting can't be changed." into pi-dev 2018-05-23 17:08:29 +00:00
Daichi Ueura
9555afb64e Hide entire hidden field for non-hidden networks
This CL hides not just hidden network spinner but entire
hidden field when a user is adding a network from scanned
network list.

Test: robotests
Bug: 80114851
Change-Id: I8b29fd764d62af1e46beaa7d26fae97848f4efe6
2018-05-23 09:18:07 -07:00
TreeHugger Robot
2626288bfa Merge "Return null when setting can't be changed." 2018-05-23 16:01:22 +00:00
Matthew Fritze
e31e60ce94 Add Location Slice
Location is an intent-only Slice.

Test: Robotests
Change-Id: Ie9ed05be2224f2c4b393ed201d5f313f80183edc
Merged-In: I07e27683b46fe4ded8215009a983bb909555fb59
Fixes: 67997314
2018-05-23 08:09:07 -07:00
Matthew Fritze
f1a7006d31 Add Location Slice
Location is an intent-only Slice.

Test: Robotests
Bug: 67997314
Change-Id: I07e27683b46fe4ded8215009a983bb909555fb59
2018-05-22 21:13:47 -07:00
Matthew Fritze
d9613b2742 Return null when setting can't be changed.
If a Slice cannot be changed, return null instead of
an error slice.

Bug: 80155832
Test: robotests
Change-Id: I843fee76cf19d49cc994062059cb231f222120b2
Merged-In: Ib94136c449c6d9c1911f89833bba62fd2263daa4
2018-05-22 20:18:09 -07:00
Matthew Fritze
417693021e Return null when setting can't be changed.
If a Slice cannot be changed, return null instead of
an error slice.

Bug: 80155832
Test: robotestst
Change-Id: Ib94136c449c6d9c1911f89833bba62fd2263daa4
2018-05-22 20:17:10 -07:00
Jason Chang
a76797e756 [SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors.
Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors and change every callers entry.

Bug: 78215054
Test: manually test for UI
Change-Id: Ie201aee439bd9e8337eca989b4cdc836a6e8e917
2018-05-21 17:23:41 +08:00
TreeHugger Robot
0e721c598e Merge "Make user explicitly set security type for tether network" into pi-dev 2018-05-19 03:17:17 +00:00
Salvador Martinez
d9bae5a15e Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-19 02:14:18 +00:00
Salvador Martinez
f3d532f43d Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Bug: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-18 15:21:07 -07:00
TreeHugger Robot
6dc6462a54 Merge "Add DnD as a special case Slice" into pi-dev 2018-05-18 14:41:45 +00:00
TreeHugger Robot
45c29f15b9 Merge "Add DnD as a special case Slice" 2018-05-18 04:06:29 +00:00
Lei Yu
c81da687a0 Merge "Fix tethering summary when airplane mode is off" into pi-dev am: a07b1f83a8
am: 8ed6b5dabf

Change-Id: I27bd8d85f0c22207336f8bf632280a5bfd243658
2018-05-17 19:21:49 -07:00
Matthew Fritze
e8b62714af Add DnD as a special case Slice
Add DND Slice as a special case, since there is an existing
inheritance structures in the zen mode preference controllers which
would be too risky to change at this point in the release.

Change-Id: If4b7013be35c89695786af2dbbea2edcf7a189f3
Merged-In: Ice608b9a7bd6f38b73e581eb3723f0a2fae96f2b
Test: make RunSettingsRoboTests
Fixes: 67997377
2018-05-17 18:20:36 -07:00
Matthew Fritze
4710917aa4 Add DnD as a special case Slice
Add DND Slice as a special case, since there is an existing
inheritance structures in the zen mode preference controllers which
would be too risky to change at this point in the release.

Test: make RunSettingsRoboTests
Bug: 67997377
Change-Id: Ice608b9a7bd6f38b73e581eb3723f0a2fae96f2b
2018-05-17 18:20:07 -07:00
TreeHugger Robot
a07b1f83a8 Merge "Fix tethering summary when airplane mode is off" into pi-dev 2018-05-18 00:49:50 +00:00
Lei Yu
4fec12cbbf Fix tethering summary when airplane mode is off
When airplane mode is off, fall back to default summary
(tether off summary). It should be fine because once tether
state get updated again, it will go through original listener
to update the summary.

Change-Id: Iba9b56f452e72365ea964d841ee156a2625c0ae1
Fixes: 79721162
Test: RunSettingsRoboTests
2018-05-17 14:38:22 -07:00
Matthew Fritze
6feddd6954 Add Wifi Slice
Add a custom Wifi Slice to the Settings Slice Provider.
It needs a custom Slice because of the complicated listener logic
in the MasterSwitchPreferenceController, which makes it hard to
work-in synchronous set/get logic.

The one-off Slice requires extra changes, including:
- Including it in getDescendants
- Handling changes to wifi by the framework

This is the first change that uses SettingsLib's broadcast relay,
which allows settings to (un)register IntentFilters to a Uri,
allowing Settings Slices affected by the framework (quicksettings,
connectivity related, volume, etc) to be updated without action
on the Slice.

Bug: 70622039
Bug: 67997332
Test: robotests
Change-Id: Ibfe4736beecb833e3f6bb871b2eb5228a5fd3a34
2018-05-17 10:16:55 -07:00
Matthew Fritze
46aa586610 Add Wifi Slice
Add a custom Wifi Slice to the Settings Slice Provider.
It needs a custom Slice because of the complicated listener logic
in the MasterSwitchPreferenceController, which makes it hard to
work-in synchronous set/get logic.

The one-off Slice requires extra changes, including:
- Including it in getDescendants
- Handling changes to wifi by the framework

This is the first change that uses SettingsLib's broadcast relay,
which allows settings to (un)register IntentFilters to a Uri,
allowing Settings Slices affected by the framework (quicksettings,
connectivity related, volume, etc) to be updated without action
on the Slice.

Fixes: 70622039
Fixes: 67997332
Test: robotests
Change-Id: Ia76738dd6baacd5522d52df2c61ebad86a600282
Merged-In: Ibfe4736beecb833e3f6bb871b2eb5228a5fd3a34
2018-05-17 09:58:19 -07:00
Chilun Huang
f4b094d13a Merge "Add index for Hotspot settings page into search" 2018-05-15 03:59:15 +00:00
Naina Nalluri
15602b3f48 Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev 2018-05-14 22:59:11 +00:00
Naina Nalluri
e6bf71abed DO NOT MERGE Add Slices for WifiCalling
Add Slices for WifiCalling
WifiCalling Slice Provider:
  1. If there is no activation needed or if the Wifi calling
     is currently turned on - provide the slice to toggle the
     value
  2. Else display appropriate message with further instructions
WifiCalling Slice Broadcast Receiver:
  1. If the action is turning off wifi or if there is no
     activation needed. Change the setting with ImsManager.
  2. And Ask to requery the slice in one second to display
     updated settings if 1 is valid or display appropriate message

Bug: 63731862
Bug: 78192106
Test: Use support-slices-demos-debug.apk to test on device
Test: Robotests
Change-Id: I29e1822fd24ebcff575fa48ad93f84ed91bf4d87
2018-05-14 20:16:01 +00:00
Naina Nalluri
6885d85a7c Add Slices for WifiCalling
Add Slices for WifiCalling
WifiCalling Slice Provider:
  1. If there is no activation needed or if the Wifi calling
     is currently turned on - provide the slice to toggle the
     value
  2. Else display appropriate message with further instructions
WifiCalling Slice Broadcast Receiver:
  1. If the action is turning off wifi or if there is no
     activation needed. Change the setting with ImsManager.
  2. And Ask to requery the slice in one second to display
     updated settings if 1 is valid or display appropriate message

Bug: 63731862
Bug: 78192106
Test: Use support-slices-demos-debug.apk to test on device
Test: Robotests
Change-Id: I29e1822fd24ebcff575fa48ad93f84ed91bf4d87
2018-05-14 10:19:15 -07:00
TreeHugger Robot
f005640b9c Merge "Make it so client code does not tie tether to wifi" into pi-dev 2018-05-12 04:37:27 +00:00
TreeHugger Robot
a3d991cc0c Merge "Make it so client code does not tie tether to wifi" 2018-05-10 23:44:01 +00:00
Salvador Martinez
a76fd8b858 Make it so client code does not tie tether to wifi
The wifi service already handles turning off tethering if
multi-interface is/isn't supported. We don't need to do tie wifi
and tethering stuff together in the UI.

Test: robotests still pass
Bug: 79213401
Merged-In: I699dfe2d7646f248a54faa5a8429176697614cdf
Change-Id: I699dfe2d7646f248a54faa5a8429176697614cdf
2018-05-10 20:36:37 +00:00
Salvador Martinez
188af9439e Make it so client code does not tie tether to wifi
The wifi service already handles turning off tethering if
multi-interface is/isn't supported. We don't need to do tie wifi
and tethering stuff together in the UI.

Test: robotests still pass
Bug: 79213401
Change-Id: I699dfe2d7646f248a54faa5a8429176697614cdf
2018-05-10 13:36:08 -07:00
Meng Wang
3a4e213037 Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev am: 6fcafbe5bf
am: ed6037dffa

Change-Id: I163fb4c27334f64362033a94ebaad55387c8da61
2018-05-10 12:10:09 -07:00
TreeHugger Robot
6fcafbe5bf Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev 2018-05-10 18:57:39 +00:00
Meng Wang
6de3389b92 Revert "Remove provisioning dialog from wifi-tethering"
This reverts commit 81ca3dd4c0.

Reason for revert:
This breaks carrier requirement to show error dialog/roaming warning.
Will make an entitlement app change to suppress the progress dialog
so that if the entitlement check succeeds no dialog will be shown
in most cases.

Bug: 78680359
Change-Id: I98d2aa5cc676308b1e2d16bf877dc6878a7bf4cb
2018-05-10 05:15:43 +00:00
Salvador Martinez
7e4f8a28eb Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
am: f94119e739

Change-Id: If887d0c414649489d483bf523316d1f960798000
2018-05-09 16:56:30 -07:00
android-build-team Robot
c0e0262f9c Merge "Rename SubSettingLauncher.setTitle, add java doc" 2018-05-09 18:01:10 +00:00
android-build-team Robot
7ce6ba52c5 Merge "Change references to old loadSafeLabel method" 2018-05-09 15:28:33 +00:00
Chilun
d3358d8a6f Add index for Hotspot settings page into search
Added index provider into TetherSettings and WifiTetherSettings pages.
Added robotests to check the keys returned by getNonIndexableKeys.
Move repeated code into utility class.

Bug: 74777873
Test: make -j RunSettingsRoboTests
Test: atest UniquePreferenceTest
Change-Id: I6cb09d735afa4867d25a79de733ce8c59634e49b
2018-05-09 14:05:15 +08:00
hjchangliao
e86eec0c07 Rename SubSettingLauncher.setTitle, add java doc
For make this method usage more clear,
setTitle(charSequence) rename as setTitleText,
add java doc: it is only for user generated string
setTitle(int) rename as setTitleRes.

Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e
Fixes: 78347436
Test: make RunSettingsRoboTests
2018-05-09 10:00:05 +08:00
Salvador Martinez
d86cbe36b0 Hide hidden network spinner for non-hidden networks
We only want to show this when a user is manually adding a
network. This CL hides it when the user is adding a network
from the detected wifi list.

Test: robotests
Bug: 78436456
Change-Id: I81d738267d4cb21d6b7722ec619faaf8ef1fc965
2018-05-07 14:46:56 -07:00
Salvador Martinez
60c513d908 Merge "Only start tether when not already enabled" into pi-dev am: f62f91b0b6
am: 964d107491

Change-Id: I0d325498e2ea8526fbc4e6ec4bf579331bf0848b
2018-04-26 14:30:25 -07:00
TreeHugger Robot
f62f91b0b6 Merge "Only start tether when not already enabled" into pi-dev 2018-04-26 20:57:57 +00:00
Oscar Shu
f64502ea86 Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am: 0b302499cd
am: 1635941c9a

Change-Id: Ic13938e0f4e876e3dfaea2049f2a7650b53fa8e1
2018-04-26 11:40:09 -07:00
Oscar Shu
0b302499cd Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev 2018-04-26 18:16:49 +00:00
Salvador Martinez
a4fe5c9871 Only start tether when not already enabled
The toggle in the tether page currently tries to start tethering if
it gets turned on. However, changing a wifi config can cause
startTether to be called and also the toggle to switch leading to
a double call to startTether. This CL makes it so that if we are
already connected to tethering we don't try to start it again.

Test: robotests
Change-Id: I91085244c5d1fcc245a6b6480e638a32bc14f0ac
Fixes: 78028548
Fixes: 78441216
Fixes: 74368363
2018-04-26 10:14:54 -07:00
xshu
0aabe7f3a8 Hide apps with NETWORK_SETTINGS from special wifi settings
A recent change is made in the wifi framework to allow apps with
NETWORK_SETTINGS permission to bypass checks for the CHANGE_WIFI_STATE
permission. Remove apps with NETWORK_SETTINGS permission from
the list because turning off CHANGE_WIFI_STATE for those apps will not
do anything.

Bug: 78228349
Test: compile, robo test
Manual test:
flash
go to Settings -> Apps & notifications -> Advanced -> Special app access
-> Wi-Fi control
Verify that the "Settings" app is no longer in the list
Top right corner -> show system
Verify that "System UI" is no longer in the list
Change-Id: Ia430a6fb4d5dee534a03609ad1877976204935b2
2018-04-25 16:13:12 -07:00
HJ ChangLiao
5693be2863 Replace PackageManagerWrapper with PackageManager
Replace all SettingsLib/PackageManagerWrapper in Settings,
by PackageManager,
Remove ShadowPackageManagerWrapper.

Bug: 62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
2018-04-24 15:12:31 +08:00
Philip P. Moltmann
952004c072 Change references to old loadSafeLabel method
... to prevent proliferation of the method via copy+paste.

Bug: 77964730
Test: Built
Change-Id: I663879dbdf94c4c5e7d1146028fd5ff7610a1e44
2018-04-23 15:13:40 -07:00