Commit Graph

6994 Commits

Author SHA1 Message Date
jackqdyulei
d622e14d85 Refactor roaming preference
Use preferenceController instead

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Idb0276ea0ed1738d93223e072338ba3c32498a9d
2018-10-17 13:03:26 -07:00
Stanley Tng
81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
TreeHugger Robot
f02115f6e1 Merge "Fix InstantiationException on fragment" 2018-10-17 17:28:22 +00:00
TreeHugger Robot
1e6455be09 Merge "Consider Private DNS user restriction" 2018-10-17 08:36:55 +00:00
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
jackqdyulei
5680477b8b Refactor DataUsagePreference
Move the logic to PreferenceController

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7a0845c0cbc3f33e23257831d0d4ed97e7a5cc04
2018-10-16 15:40:17 -07:00
jackqdyulei
1d133e3f04 Refactor carrier settings
Only show it when:
1. It is in CDMA or GSM mode
2. CarrierConfig tell settings to show it

Bug: 114749736
Test: RunSettingsRoboTests

Change-Id: I45ecbc86c793ebec602142be208058e2043a2ba7
2018-10-16 15:33:20 -07:00
jackqdyulei
2de3d28138 Refactor CdmaApnPreference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I3d0203b7b5fb732e2814fb741761af4371924e9a
2018-10-16 15:33:20 -07:00
jackqdyulei
37f2e60b8c Refactor CdmaSubscriptionListPreference
Extract CdmaBasePreferenceController that can be shared by all CDMA
PreferenceController. Also create new subscription controller to use
it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7cfc27ffd0704d09dc02e49fbf5641ff8b90642d
2018-10-16 15:33:20 -07:00
tmfang
d5405cf49d Fix InstantiationException on fragment
Since we overrided the empty constructor,
it can't find a empty constructor when
Fragment tries to instantiate a fragment
in framework.

So, we can't override this constructor,
and then just use newInstance() to initialize
and setup a new Fragment.

Test: robotest
Change-Id: Ifcd1c1771bc69d947caeee5c5bc055c4f94365c2
Fixes: 115676209
2018-10-17 04:20:09 +08:00
TreeHugger Robot
56aca80681 Merge "Fix ActionDisabledByAdminDialogHelperTest" 2018-10-16 00:54:51 +00:00
Stanley Tng
a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
jackqdyulei
820e22d324 Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API

Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.

Bug: 115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-15 16:58:21 -07:00
Doris Ling
87df629dbb Merge "Get app info with correct user id." 2018-10-15 23:23:23 +00:00
Stanley Tng
a6c927b51a Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-15 22:51:02 +00:00
Philip P. Moltmann
098d3a79fd Fix ActionDisabledByAdminDialogHelperTest
- Revert user handling in setAdminSupportDetails to before my changes.
- Implement getUserProfiles in Settings-shadows as the the
  Settings-shadows do not forwarded to profiles the robolectric-default
  shadows

Test: make RunSettingsRoboTests
Change-Id: Idfd4722fe55a17c57d336db943904eb1aeb6e7ce
2018-10-15 14:30:34 -07:00
Eran Messeri
717194c87c Consider Private DNS user restriction
As a new user restriction, to disallow changing Private DNS settings, was
added, make the Private DNS mode dialog preference consider whether to
let the user modify it or not based on the presence of this restriction.

Bug: 112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: Manual, using TestDPC

Change-Id: If815860ace3aadf6f79fd23173f0a2c80a29f0e1
2018-10-15 21:34:47 +01:00
TreeHugger Robot
0d0eec6d4e Merge "Refactor CdmaSystemSelectListPreference" 2018-10-15 20:08:31 +00:00
Philip P. Moltmann
b9a83d584d Merge "Use SYSTEM_... window manager flags" 2018-10-15 16:28:39 +00:00
Stanley Tng
a4fc23140a Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116725094
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit 068c2547f6)
2018-10-13 16:21:15 -07:00
jackqdyulei
b820483fad Refactor CdmaSystemSelectListPreference
Most logic is copied from previous ListPreference however
1. Create PreferenceController for it
2. Extract API to check whether to display CMDA options
3. In controller, provide API to force display dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Ic40d2ac1dc1854df9c90d912ea9fc822531b413d
2018-10-12 10:11:58 -07:00
Mill Chen
2559f02d68 Clean up unnecessary spy context statements
Remove spy context syntax because we do not need to
mock context anymore in the test cases.

Bug: 117644158
Test: robotests
Change-Id: I222eec4fbc1994d7bb79adead40b76ac0a000bdc
2018-10-12 21:54:02 +08:00
TreeHugger Robot
ddd70cdbf6 Merge "Disable sliceView scrolling in the homepage." 2018-10-12 05:05:03 +00:00
Emily Chuang
e7a6d1ca1e Disable sliceView scrolling in the homepage.
Set isScrollable() to false so as to have the "see more" option.

Fixes: 117626982
Test: robotest
Change-Id: Ie0b8a207fb0c1eff41a98cc897e5f8cf29ccce0a
2018-10-12 10:16:51 +08:00
Doris Ling
b9ff5892ca Get app info with correct user id.
- when querying app info from package manager, we should use the methods
that takes the user id so that it will work properly with managed
profile.

Change-Id: Ifc84d3a29aaf7b2c1acfa096596a53f1715cc908
Fixes: 117222623
Test: make RunSettingsRoboTests
2018-10-11 16:47:03 -07:00
jackqdyulei
8eec6ff917 Change packagename to telephony
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
2018-10-11 11:46:38 -07:00
Lei Yu
695638ce35 Merge "Copy wifiCalling method from telephony to settings" 2018-10-11 04:11:07 +00:00
TreeHugger Robot
45d8fbe54f Merge "Change search fab to search bar." 2018-10-11 02:42:24 +00:00
Lei Yu
62dc9bb747 Merge "Add network listener in MobileSettingsActivity" 2018-10-11 01:14:09 +00:00
Lei Yu
9b373eb7a0 Merge "Refactor MobileDataPreference" 2018-10-11 00:24:56 +00:00
Fan Zhang
3181e1aceb Change search fab to search bar.
- Remove search fab from layout xml
- Change RelativeLayout to CoordinatorLayout so we can use prebuilt
  scrolling behavior
- Minor update to theme so search bar background works in dark mode for
  the homepage activity.

Change-Id: If7408c12684be65137e04ae3bb4137204c2d77e0
Fixes: 117508596
Test: robotests, visual
2018-10-10 16:29:22 -07:00
TreeHugger Robot
04434eb662 Merge "Remove ShadowKeyValueListParser" 2018-10-10 23:23:41 +00:00
jackqdyulei
496094ccde Copy wifiCalling method from telephony to settings
Bug: 114749736
Test: Build
Change-Id: Iec45273e6a74afe940c280e50a473edc31473994
2018-10-10 16:07:49 -07:00
jackqdyulei
1a4781881e Add network listener in MobileSettingsActivity
Listen to subscription change. If it is changed, refresh UI and build
new fragment for it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I436b4d62b06230e767892bda6cf8582d4946097b
2018-10-10 16:05:58 -07:00
jackqdyulei
36063b9222 Refactor MobileDataPreference
1. Remove it and change it to SwitchPrference
2. Build MobileDataDialogFragment to show dialog when needed
3. Create controller for it to decide when to launch the dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I02b9662c5829e765f2c71d10ed951d792cf7aaa1
2018-10-10 16:05:08 -07:00
TreeHugger Robot
5da72a145f Merge "Use default network template in billing cycle settings." 2018-10-10 20:53:55 +00:00
jackqdyulei
3f365a91e9 Remove ShadowKeyValueListParser
It is not used anymore.

Change-Id: I52991f42bc0872fd98809d6d6596f4b85d041d60
Fixes: 38346649
Test: RunSettingsRoboTests
2018-10-10 13:49:00 -07:00
Fan Zhang
6a1f77ef89 Merge "Use proto in contextualCard object" 2018-10-10 20:19:38 +00:00
Fan Zhang
2f324c9484 Merge "Remove mocked resources from slice test cases" 2018-10-10 20:13:52 +00:00
Doris Ling
c4b40b0669 Use default network template in billing cycle settings.
- if the network template is not set in the bundle arguments, use the
default network template for getting the billing data.
- change to use ConnectivityManager.from(context) in DataUsageUtils to
be consistent with the usage in other methods.

Change-Id: I25eb27f8f26d9ecafc66aa2c69806e94c6b63499
Fixes: 117452991
Test: make RunSettingsRoboTests
2018-10-10 12:50:34 -07:00
Philip P. Moltmann
8e6883185b Merge "Use new RestrictedLockUtils API" 2018-10-10 19:50:06 +00:00
Rick Yiu
31e062e640 Merge "Add null check for vrManager" into pi-dev
am: c9e2d80ade

Change-Id: Ifb1f2da7e3493e91f26735e7609c4480b1f0f346
2018-10-10 11:07:11 -07:00
TreeHugger Robot
c9e2d80ade Merge "Add null check for vrManager" into pi-dev 2018-10-10 17:46:55 +00:00
Raff Tsai
8cd659af19 Use proto in contextualCard object
Test: make RunSettingsRoboTests
Change-Id: Ic7af69047e33e3b10a993dd9820b4c6ceb23666c
2018-10-10 10:35:51 -07:00
Fan Zhang
403beab3fb Merge "Remove hacks to access framework private resources" 2018-10-10 17:10:12 +00:00
Raff Tsai
3ce67421a3 Fix test case error
Test: make RunSettingsRoboTest
Change-Id: Id8e13cdd13b4a5f21dad5f84be7110ca8cf5282f
2018-10-10 21:06:19 +08:00
Philip P. Moltmann
fc9951091f Use SYSTEM_... window manager flags
Test: Built
Bug: 116798569
Change-Id: Iac0728b348b6105b843d83415f0abde2de3cb074
2018-10-09 13:45:10 -07:00
Philip P. Moltmann
035ea3b0d1 Use new RestrictedLockUtils API
This is made necessary by changes to the SystemAPI the lib relies on.

Test: RunSettingsRoboTests
Bug: 116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44
2018-10-09 12:39:19 -07:00
TreeHugger Robot
b3eaf62562 Merge "Add entitlement check for usb tethering" 2018-10-09 19:16:07 +00:00
Fan Zhang
69d35593c8 Merge "Add a filter to take out unnecessary homepage data." 2018-10-09 16:48:04 +00:00