Commit Graph

3093 Commits

Author SHA1 Message Date
TreeHugger Robot
72818e78b3 Merge "Move backup package tests to sdk 26" 2017-11-28 01:12:35 +00:00
TreeHugger Robot
19c4a05d92 Merge changes I9815f48e,Ib344f062,I84b62392,I81bfdff0
* changes:
  Move applications test package to sdk 26
  Update tests to sdk 26
  move manageapplications to sdk 26
  Update viewholder tests to sdk 26
2017-11-28 00:32:37 +00:00
TreeHugger Robot
9ce491f2c6 Merge "Update RecentAppsPreferenceControllerTest to sdk26" 2017-11-28 00:02:53 +00:00
jeffreyhuang
60d1b38051 Move backup package tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I016e8ae3336544c4c75ead96d06e4b461ed13773
2017-11-27 15:32:12 -08:00
jeffreyhuang
253cb2fbc3 Move applications test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I9815f48ed9c6ddcfdae10cf09fbdf742a7066dfa
2017-11-27 14:57:32 -08:00
jeffreyhuang
b83fd6c3d1 Update tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ib344f0622dfa3b9f9a8fdd6736bc34cb4f536db8
2017-11-27 14:57:32 -08:00
Jeffrey Huang
1eb5c3eede Merge changes I8668be19,Ifb7769a1
* changes:
  move defaultapps package to sdk 26
  Update DefaultAppInfoTest to sdk 26
2017-11-27 21:47:12 +00:00
jeffreyhuang
90dd4b668a move manageapplications to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I84b62392a4a4d55c1d4e6a9eadc5910e4b9a8530
2017-11-27 13:45:51 -08:00
jeffreyhuang
85aa1ea129 Update viewholder tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I81bfdff059255b3e7a20270dea62ffd56cc53ad5
2017-11-27 13:45:51 -08:00
jeffreyhuang
3b0b8b711e Update RecentAppsPreferenceControllerTest to sdk26
- Remove the usage of the mock context to avoid null pointers in sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I73dac0c91e56d84cdec0314a4ec5754a0a98c54b
2017-11-27 13:37:31 -08:00
TreeHugger Robot
0ab7616cea Merge "Move assist package to sdk 26" 2017-11-27 19:50:34 +00:00
TreeHugger Robot
d7054033cb Merge "rename v2 controllers" 2017-11-27 19:48:36 +00:00
jeffreyhuang
cde01ce7dd move defaultapps package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I8668be1963135af3088229c440ac2aff88b77899
2017-11-27 11:19:00 -08:00
jeffreyhuang
3228ef64c2 Update DefaultAppInfoTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ifb7769a1bf0b22581dac80d7343e6cb58515af26
2017-11-27 11:18:19 -08:00
jeffreyhuang
32c3f96c23 Move assist package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Id37a5b2e445481bc586f12a4397e7082f28ec075
2017-11-27 10:21:47 -08:00
TreeHugger Robot
03b2d4c44c Merge "Disable DevelopmentSettingsActivity by default" 2017-11-23 01:47:53 +00:00
Jeffrey Huang
5999f5d892 Merge "Move accounts package tests to sdk 26" 2017-11-23 00:53:02 +00:00
Jeffrey Huang
7c18a20624 Merge "Update AccountDetailDashboardFragmentTest" 2017-11-23 00:52:50 +00:00
Jeffrey Huang
aaffb5fd4a Merge "Update SetupChooseLockPatternTest to SDK 26" 2017-11-23 00:52:39 +00:00
jeffreyhuang
e89dc36149 rename v2 controllers
- Remove v2 postfix on controllers now that v1 dev options have been
 removed

Bug: 34203528
Test: compiles and tests still pass
Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591
2017-11-22 16:51:15 -08:00
TreeHugger Robot
dd1091c4b4 Merge "Fix AutoSyncDataPreferenceControllerTest" 2017-11-23 00:16:58 +00:00
TreeHugger Robot
c18f54d3e8 Merge "Fix RemoveAccountPreferenceControllerTest" 2017-11-23 00:04:33 +00:00
Fan Zhang
831f6302ee Disable DevelopmentSettingsActivity by default
And if for any reason monkey user is able to enter develop option page,
we show nothing.

And update some test to sdk 26.

Change-Id: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes: 68707778
Test: robotests
2017-11-22 14:44:23 -08:00
jeffreyhuang
65304af215 Fix AutoSyncDataPreferenceControllerTest
- Prevent this test from hanging due to fragment deep mock

Test: make RunSettingsRoboTests -j40
Change-Id: I043303c87eb89508fd96e151a17dc70a7b7fa3bb
2017-11-22 14:28:01 -08:00
jeffreyhuang
90f59be20b Move accounts package tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I5f5a1f87aff5e1067e9339010b988e58fcc5b704
2017-11-22 14:24:45 -08:00
jeffreyhuang
f6c64b532f Fix RemoveAccountPreferenceControllerTest
- prevent the test from hanging due to passing a deep fragment mock

Test: make RunSettingsRoboTests -j40
Change-Id: I60b6f32b19563dbcd25eda9d98a8c0266480a3f9
2017-11-22 14:19:15 -08:00
Yueming Wang
eeffbf6225 Merge "Block settings when DISALLOW_CONFIG_DATE_TIME." 2017-11-22 21:36:28 +00:00
TreeHugger Robot
4f1b966213 Merge "Move accessibility package to sdk 26" 2017-11-22 21:32:24 +00:00
jeffreyhuang
be36ba3432 Update SetupChooseLockPatternTest to SDK 26
- create a new ShadowResourcesImpl because sdk 26 calls loadDrawable
 from ResourcesImpl instead of Resources

Test: make RunSettingsRoboTests -j40
Change-Id: I8eed76ea779972c68893d4e7fdfc4493465b9b22
2017-11-22 13:05:39 -08:00
yuemingw
7b1da61346 Block settings when DISALLOW_CONFIG_DATE_TIME.
Test: m -j RunSettingsRoboTests
runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/core/UserRestrictionTest.java

Fix: 67497909

After turn on the user restriction in TestDPC:
https://hsv.googleplex.com/5414119658225664
The date time settings page become:
https://hsv.googleplex.com/5199302573948928


Change-Id: I42590c4a505ec1b6ffa86eb460b90fa6ec8ba783
2017-11-22 19:53:18 +00:00
jeffreyhuang
2179c16b09 Update AccountDetailDashboardFragmentTest
- Update test to work with sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I4c1c98330951f48f378330b51178fc188bba2571
2017-11-22 11:40:57 -08:00
jeffreyhuang
cafc84d2d0 Move accessibility package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I6fa70ec4da82e29934a21cd5780175aa510b5d62
2017-11-22 11:21:29 -08:00
TreeHugger Robot
bd642f9db8 Merge changes Ia2ab6b67,I85a9ef21
* changes:
  Update ConnectedDeviceGroupController
  Add infrastructure for connected device group.
2017-11-22 02:33:41 +00:00
jackqdyulei
75ea67c9f4 Update ConnectedDeviceGroupController
Get the PreferenceGroup there and add/remove preference
through the callback

Also add ConnectedBluetoothDeviceUpdater which only filter
the connected device.

Bug: 69333961
Test: RunSettingsRoboTests

Change-Id: Ia2ab6b6708329227929d6fe442df3a8d45bf86f5
2017-11-21 14:44:35 -08:00
jackqdyulei
88579e2558 Add infrastructure for connected device group.
The core thing is to find out a way to update group when devices
(bt device and usb device)are updated.

The infrastructure contains three parts:
1. ConnectedDeviceController
Normal PreferenceController. Get info from sub controller and update
the preferenceGroup.

2. BluetoothDeviceUpdater
Listen to bluetooth callback, decide whether to add/remove devices

3. DevicePreferenceCallback
Interface to add/remove preference. This interface will be used in
ConntectedDeviceController and future SavedDeviceController

Bug: 69333961
Test: RunsettingsRoboTests
Change-Id: I85a9ef216a801d5f0dd1cf0130d53850a68be4bd
2017-11-21 12:46:30 -08:00
TreeHugger Robot
95cd246993 Merge "Move some tests to sdk version o" 2017-11-21 02:40:01 +00:00
Lei Yu
064a76c3d3 Merge "Add feature flag for connected device" 2017-11-21 01:13:29 +00:00
TreeHugger Robot
197c0c83de Merge "Do not add SelectUsbConfigPreferenceController if USB is disabled." 2017-11-21 00:43:35 +00:00
jeffreyhuang
c47d806d30 Move some tests to sdk version o
Test: make RunSettingsRoboTests -j40
Change-Id: I8fa5dc1f371b5b16403304d0dc2bc821d6f3804a
2017-11-20 16:40:02 -08:00
jackqdyulei
76ba0f72e4 Add feature flag for connected device
Add feature flag to toggle connected device between new and old
feature.

ConnectedDeviceDashboardFragment will contain new feature will
ConnectedDeviceDashboardFragment2 will hold old feature.

Bug: 69333961
Test: Build
Change-Id: I0ea932c69dea5242129aab994d5142b1f87fbea0
2017-11-20 15:29:28 -08:00
TreeHugger Robot
b46078fdc8 Merge "Revert "Revert "Prevent monkey from changing usb settings""" 2017-11-20 21:45:29 +00:00
Lei Yu
a6005aa3b1 Merge "Decouple BluetoothDevicePreference and DeviceListPreferenceFragment" 2017-11-20 21:27:20 +00:00
Ben Lin
3f5d58b981 Do not add SelectUsbConfigPreferenceController if USB is disabled.
Bug: 69479572
Test: Local cherry-picked to master-arc-dev, and deployed cheets_x86 to
a ChromeOS device. Developer Options show up.
Updated SelectUsbConfigPreferenceControllerTest.

Change-Id: I8c6a4501849e67c92f50b8a3781260e9dbcdaf20
2017-11-20 13:26:15 -08:00
Jeffrey Huang
5a280667ba Revert "Revert "Prevent monkey from changing usb settings""
This reverts commit da3f0d9e56.

Change-Id: I6d63305e18c2b95676feb60f2526dcade951cd3f
2017-11-20 10:58:38 -08:00
Julia Reynolds
14ed3f176e Merge "Restore group block button." 2017-11-20 18:11:33 +00:00
jackqdyulei
cf1ce05ce5 Decouple BluetoothDevicePreference and DeviceListPreferenceFragment
The BluetoothDevicePreference need to know whether to display with an
invalid name. However pass in the whole fragment is over-killing.

This cl decouple it for several reasons:
1. In P, BluetoothDevicePreference will be used in other fragment.
2. In preference lifecycle from end user side, this flag is constant.

Bug: 69333961
Test: RunSettingsRoboTests
Change-Id: I3dbcd2a4aafa3ead74371534250e5e7c3ee221f7
2017-11-20 10:11:20 -08:00
TreeHugger Robot
d332f5c316 Merge "Add owners files to notification test dirs" 2017-11-20 18:10:59 +00:00
Jeffrey Huang
07394c9931 Merge "Enable flag for about phone v2" 2017-11-20 18:10:14 +00:00
Julia Reynolds
8603c7ea62 Add owners files to notification test dirs
Test: make
Change-Id: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
2017-11-20 16:40:47 +00:00
Julia Reynolds
a87cee11b6 Restore group block button.
Test: RunSettingsRoboTests
Bug: 63927402
Change-Id: I2e8163082d81d696dce2082be49a16c85458672b
2017-11-20 09:11:57 -05:00