Commit Graph

6716 Commits

Author SHA1 Message Date
TreeHugger Robot
56aca80681 Merge "Fix ActionDisabledByAdminDialogHelperTest" 2018-10-16 00:54:51 +00:00
Doris Ling
87df629dbb Merge "Get app info with correct user id." 2018-10-15 23:23:23 +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
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
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
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
Fan Zhang
0bd5394381 Merge "Add storage slice in Contextual Settings Homepage" 2018-10-09 16:45:35 +00:00
TreeHugger Robot
1e80322df8 Merge "Allow DND events rule to choose custom calendars" 2018-10-09 16:25:22 +00:00
Mill Chen
fdf06e242a Remove mocked resources from slice test cases
Clean up some resources which are useless for the moment.

Bug: 117485451
Test: robotests
Change-Id: Id3591178791cc6c9f628a99a8916e9007a399728
2018-10-09 23:25:44 +08:00
Emily Chuang
9f25efc4d8 Add a filter to take out unnecessary homepage data.
After getting the full list from CardContentProvider, at render side
(Settings side) we should perform final filtering to filter out those
data that are not applicable at that moment. Apart from that, we should
also perform slice URI check in this stage to take out invalid slices.

Bug: 116063073
Test: robotests
Change-Id: Idfa94ec6176a9d9cb3379543e0a23858941af742
2018-10-09 16:20:34 +08:00
Mill Chen
0432a46627 Add storage slice in Contextual Settings Homepage
- Add storage card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for storage slice.

Bug: 117074909, 115971399
Test: visual, robotest, SliceBrowser
Change-Id: Idc7d47ba934c2556c124220545ecc73fb2beb7e2
2018-10-09 15:20:29 +08:00
Maurice Lam
24aea5dae5 Remove hacks to access framework private resources
ag/5200295 now allows framework private resources to be resolved.

Test: atest RunSettingsRoboTests
Change-Id: Idaf2144bea6d3b44ec133e48d89e6674256b4cbe
2018-10-08 19:29:03 -07:00
Mill Chen
bf421af90f Merge "Add device info slice in Contextual Settings Homepage" 2018-10-09 01:49:17 +00:00
Maurice Lam
7243a4016b Merge "Ignore lock type in ChooseLockGeneric in non-FBE" 2018-10-09 01:02:25 +00:00
Lei Yu
dd2908d5ce Merge changes I3008bf85,I43aebf2e,I4fda0708,I744d5376
* changes:
  Remove AdvancedOptionsPreference
  Add activity for mobile network page
  Fix the complie error of network migration
  Copy MobileNetworkSettings to settings app
2018-10-08 22:12:26 +00:00
Fan Zhang
6632529ba1 Remove DeviceIndex feature/service.
Change-Id: I8444101669aef013183842c2d13cf3960c756398
Fixes: 112587202
Test: rerun all tests
2018-10-08 13:47:07 -07:00
jackqdyulei
106ae1d742 Add activity for mobile network page
1. Extract the Tabhost to activity level, not fragment level. So
each mobile fragment has a constant subscriptionId
2. Use BottomNavigationView instead of TabHost

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I43aebf2ec01a945697c6b2302ab750e715e4bfef
2018-10-08 11:00:35 -07:00
Doris Ling
77f7bf675c Merge "Fix typo in getHistoriclUsageLevel()" 2018-10-08 17:24:37 +00:00
Mill Chen
f4a785cec7 Add device info slice in Contextual Settings Homepage
- Add device info card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for device info slice.

Bug: 114790594, 115971399
Test: robotests, manual, SliceBrowser
Change-Id: I627a5b442e6ee20b3fd2e0500b31921bfec7b1d3
2018-10-08 20:20:23 +08:00
Sooraj Sasindran
6607361db7 Merge "Use updated APIs for CBRS" 2018-10-06 03:41:26 +00:00
Doris Ling
d9663b7822 Fix typo in getHistoriclUsageLevel()
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I523e43f60948e49e78d518a4eeb3ed2bf885f7bd
2018-10-05 14:22:07 -07:00
Maurice Lam
446637e583 Ignore lock type in ChooseLockGeneric in non-FBE
We need to show the encryption opt-in in non-FBE cases.

Test: atest RunSettingsRoboTests
Bug: 115847373
Change-Id: I3a92b265c9c8ecf5d4af009943b5b9483e25a738
2018-10-05 13:30:55 -07:00
Beverly
833119a4e2 Allow DND events rule to choose custom calendars
For the System DND Events rule, users can now select
custom calendars they are contributors to that are
synced to their device.

Test: atest /extra/master/packages/apps/Settings/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
Bug: 113368047
Change-Id: I1b81c528655b8f68867d881cee8125aa2b027eaa
2018-10-05 14:58:00 -04:00