Commit Graph

6838 Commits

Author SHA1 Message Date
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
TreeHugger Robot
de5dbf1a3e Merge "Get ethernet data usage from NetworkStatsManager." 2018-10-04 20:00:19 +00:00
Doris Ling
ab9c9e4df9 Get ethernet data usage from NetworkStatsManager.
- change to use NetworkStatsManager.querySummaryForUser() to check for
ethernet usage data instead of getting it from INetworkStatsSession.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I60364b4a5f7879906beba194c50955154d56803a
2018-10-04 10:15:44 -07:00
Lei Yu
220b11b0f3 Merge "Still check the visibility of view" 2018-10-04 17:08:58 +00:00
TreeHugger Robot
633650969a Merge "Add PreferenceController for support tile in homepage." 2018-10-03 22:46:56 +00:00
Fan Zhang
dd5828c054 Add PreferenceController for support tile in homepage.
Change-Id: I8fe93456a761382513c07ff85c858ded30f599fc
Fixes: 116875332
Test: robotests
2018-10-03 13:35:12 -07:00
TreeHugger Robot
414c212909 Merge "Change reset page to be SUW style" 2018-10-03 20:29:45 +00:00
Doris Ling
3c5850ee62 Use the new loader to show app data usage details.
- this is for showing the detail usage (total, background, and
foreground) for a specific app for each billing cycle.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I8e02872a4204b682089ea117811b50966e785c55
2018-10-03 19:49:22 +00:00
Lei Yu
4b2a053bed Merge changes I44039704,Iee0de8a2
* changes:
  Use isConnected in CachedBluetoothDevice
  Update "Previous connected device" preference
2018-10-03 19:04:16 +00:00
felkachang
a6cec47326 Change reset page to be SUW style
The factory reset page and the reset confirmation page is too old to
follow the style of Setup Wizard design. To change the layout and apply
the style for textviews and header.

Bug: 73738836
Test: make -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I1ee3d09e1ef9cac8e25c60a566363d4f7d537eeb
2018-10-03 11:45:49 -07:00
TreeHugger Robot
5cb7e3c0ab Merge "Use the new loader to show app data usage summary." 2018-10-03 01:30:40 +00:00
TreeHugger Robot
3f45adfeb1 Merge "Check instance before casting" 2018-10-02 23:41:35 +00:00
Doris Ling
b758e2b473 Use the new loader to show app data usage summary.
- this is for getting the summary text for Apps & notifications ->
(select an app) -> Mobile data & Wi-Fi

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ib4d8e7308ea8a782b9af3bbb99db2b1235e0aca2
2018-10-02 16:21:14 -07:00
jackqdyulei
8800b9e1ff Use isConnected in CachedBluetoothDevice
This method check whether it has connected profile, not physical
connection between devices.

It make more sense to use it in settings:
1. We only care about whether it has active profile(i.e. A2dp, hfp..)
2. Sometime when profile is disconnected, BluetoothDevice.isConnected()
still return true. This may make UI flaky.

Bug: 79947085
Test: RunSettingsRoboTests
Change-Id: I44039704508a742c7a8aef0a035afcf169b08939
2018-10-02 15:55:21 -07:00
jackqdyulei
184b3a4c68 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
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-02 15:41:46 -07:00
Fan Zhang
53bdd9961c Check instance before casting
Change-Id: I1917b2d8e045904145ea833abf35fa1d008fa224
Fixes: 116855783
Test: robotests
2018-10-02 15:15:38 -07:00
TreeHugger Robot
54e4100ac0 Merge "Add SettingsContextualCardProvider" 2018-10-02 21:18:46 +00:00
Sooraj Sasindran
3d56d5924b Use updated APIs for CBRS
Use updated APIs for CBRS

Bug: 117156243
Test: verified enable disable using UI
Change-Id: Ib6be6479c9f51b7c2dd80db5f7971a8c7e820954
2018-10-02 11:05:59 -07:00
TreeHugger Robot
b021f3285b Merge "Settings change for device-wide unknown sources block." 2018-10-02 13:07:24 +00:00
Raff Tsai
3936e9f3d6 Add SettingsContextualCardProvider
- provide contextual cards for SettingsIntelligence
- add contextualcards libs

Fixes: 116837093
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage.contextualcards"

Change-Id: I873e77fa43e9a8f6056be1f583b1910002efbd2e
2018-10-02 15:04:58 +08:00
TreeHugger Robot
ab7dba0d97 Merge "Support phone number in Settings slices" 2018-10-02 02:43:17 +00:00
Doris Ling
6548d21839 Merge "Add version 2 of AppDataUsagePreferenceController." 2018-10-01 21:46:08 +00:00
TreeHugger Robot
1161052e70 Merge "Application accepts null intents causing a crash" 2018-10-01 21:11:56 +00:00
Doris Ling
863c60ffcf Add version 2 of AppDataUsagePreferenceController.
- a simple copy of AppDataUsagePreferenceController to
AppDataUsagePreferenceControllerV2, so that future modification can
be compared more easily.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ibeed7775a223794bf50f36b3b933e270a55e3b39
2018-10-01 11:47:21 -07:00
Raff Tsai
af9eb2d7a7 Application accepts null intents causing a crash
Change-Id: Ia7f98f43567f25ae7abc6e5ac7e07323e75d9047
Fixes: 116869239
Test: adb shell am start -n com.android.settings/com.android.settings.Settings\\\$ApnEditorActivity
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.network"
2018-10-02 02:04:41 +08:00
Fan Zhang
3600c03392 Merge "Support some phone information in Settings slice" 2018-10-01 16:46:19 +00:00
Fan Zhang
f9f6200b28 Merge "Remove FragmentUtilsTest class" 2018-10-01 16:45:19 +00:00
Irina Dumitrescu
e9c8a0f264 Settings change for device-wide unknown sources block.
Update the "Install unknown apps" preferences to display the option is
disabled if the global user restriction for unknown apps is turned on.

Test: Manual test, disallowing installs in TestDPC disables installing
unknown sources apps. Also:
atest packages/apps/Settings/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
Bug: 111335021
Change-Id: I235e5fd110e296ed43aa89d7a5ec0d48470c4023
2018-10-01 12:15:00 +01:00
tmfang
e402cb2744 Support phone number in Settings slices
- Let controller of phoner number extends BasePreferenceController,
so it can be supported showing slice view by SettingsSliceProvider.

Test: make RunSettingsRoboTests
Bug: 74900516
Change-Id: Id98e6aac981025159a0530c6e0709ba0f2ebcd15
2018-10-01 11:15:02 +08:00