Commit Graph

380 Commits

Author SHA1 Message Date
Mill Chen
092f66b279 Merge "Add Data usage slice in Contextual Settings Homepage" 2018-09-26 14:55:31 +00:00
Fan Zhang
754f737c2c Move AppPreference to settingslib, and change imports.
Bug: 116364655
Test: robotests
Change-Id: I313272737dc7c068c47abf8ea021de7d2bea0a25
2018-09-25 09:51:19 -07:00
Mill Chen
736b77c04a Add Data usage slice in Contextual Settings Homepage
- Add Data usage card that implements CustomSliceable in Contextual Settings
Homepage.
- Add test case for Data usage slice.

Bug: 114796538
Test: robotests, manual, SliceViewer
Change-Id: I66a046e8f589a477007ea73e1b22420d3efdebde
2018-09-25 10:46:49 +08:00
TreeHugger Robot
cf3af28588 Merge "Add a controller and renderer for Slices." 2018-09-20 05:42:56 +00:00
Emily Chuang
0757e49260 Add a controller and renderer for Slices.
Many contextual cards will be built as slices, so we need a controller
and a renderer for them.

Change-Id: I3816db09ba0181399810652fb18fbe11ce273267
Fixes: 115709730
Test: robotests
2018-09-20 09:50:54 +08:00
Philip P. Moltmann
a5918a6a68 Make Settings use system-api restricted icon.
Test: Browsed around settings
Bug: 110953302
Change-Id: I1b19be721719ed8946cb558b93119b1b0e173794
2018-09-17 15:48:31 -07:00
Fan Zhang
2ee4a4846e Move ShadowXmlUtils to settingslib
Test: robotests
Change-Id: Iadea11ff207cab90a9803cb88d76b7b00b4a03df
2018-09-11 12:54:23 -07:00
Fan Zhang
9aca4cb48c Add config to disable app tray preview in display size.
Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 15:03:54 -07:00
Fan Zhang
6312aa28e3 Fix resource not found error in robolectric tests
Test: rerun tests
Change-Id: I5374fb39b9b10bebb5b7fe92ae9e787ac9db0deb
2018-09-10 10:25:08 -07:00
Fan Zhang
44be9131b1 Open personal settings tab when launching homepage
Change-Id: I341e1a128fda7db8f953f9a0800050cc007554c5
Fixes: 114441682
Test: manual/robotest
2018-09-07 13:44:21 -07:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
TreeHugger Robot
dcd8e75b3e Merge "Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*" 2018-08-23 19:09:48 +00:00
hughchen
ab1bc299d8 Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*
1. Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*
2. Use BluetoothDevice.setPhonebookAccessPermission() directly.
3. Use BluetoothDevice.setMessageAccessPermission() directly.
4. Use BluetoothDevice.getPhonebookAccessPermission() directly.
5. Use BluetoothDevice.getMessageAccessPermission() directly.
6. Use BluetoothDevice.getSimAccessPermission() directly.

Bug: 112517004
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibe6b207b891b9bd2b328a2e2c7264a9a78cb498f
2018-08-23 11:27:49 +08:00
Fan Zhang
a2adcc57c8 Fix special access summary text
Use ApplicationState to count number of apps using unrestricted_data.

Change-Id: I083ff50e3e516536c87afa71d786b22e83d9a498
Fixes: 69313992
Test: robotests
2018-08-22 17:48:03 -07:00
TreeHugger Robot
059c9c8e5e Merge "Declare "searchable" attribute for preferences." 2018-08-16 17:20:37 +00:00
Fan Zhang
a79c377fbc Declare "searchable" attribute for preferences.
Now we can easily mark a preference nonIndexable in xml instead of
adding key into searchIndexProvider.

Bug: 112608186
Test: robotests
Change-Id: I0ff16d44bb7b6ad148d3d35f09ca0da0163f73f4
2018-08-16 09:06:39 -07:00
timhypeng
273c6d3918 Remove test-purpose constructor from ConnectedBluetoothDeviceUpdater
- replace mock object with ShadowCachedBluetoothDeviceManager to test CachedBluetoothDevice
- rename cachedDevices to mCachedDevices

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib024a3e9c3af745b1ab0be36361165a547cfa756
2018-08-16 01:24:40 +00:00
TreeHugger Robot
ac03e735df Merge "Implement createPrefControllers for tether page" 2018-08-15 22:21:18 +00:00
jackqdyulei
f5aa59e99e Implement createPrefControllers for tether page
So tether preferences could show up in search

Change-Id: I234680aff878451df2a634cb58538bb2627d2eff
Fixes: 112599941
Test: Robotests
2018-08-15 13:15:04 -07:00
TreeHugger Robot
e46e3d1cc9 Merge "Replace LocalBluetoothAdapter with BluetoothAdapter" 2018-08-09 09:58:30 +00:00
Chienyuan
fca684aab6 Replace LocalBluetoothAdapter with BluetoothAdapter
LocalBluetoothAdapter is obsolete, use BluetoothAdapter instead.

Bug: 111810977
Test: make -j50 RunSettingsRoboTests
Change-Id: I5109a0296c1006a3c2e346bf966ef8901c101e30
2018-08-09 11:40:54 +08:00
TreeHugger Robot
f177af7f9d Merge "Fix failed test cases" 2018-08-08 04:31:40 +00:00
Raff Tsai
72cfe1a17a Fix failed test cases
It looks like robolectric need some change to fit current
support library or framework. We add shadow to replace
some crashed function.

Fixes: 111941314
Test: make RunSettingsRoboTests
Change-Id: If5afadf3c602fc2aa961a04f7022079c43e99c63
2018-08-08 11:17:44 +08:00
TreeHugger Robot
4453a60c17 Merge "Add a reason field to vibrator service" 2018-08-07 19:42:58 +00:00
Fan Zhang
19d3597bf2 Fix robo tests
We are pointing to intermediate built files for resource. We should
instead just remove the ResourcePath list and let Robolectric extract
res files from built apk (supported in a newer version or robolectric)

Change-Id: Iaed2160518b90a8a678c8526295dcfa74c8e3c42
Fixes: 112160027
Test: robotests
2018-08-02 17:01:40 -07:00
TreeHugger Robot
1b47c056b2 Merge "Use BluetoothAdapter instead of LocalBluetoothAdapter" 2018-07-31 04:54:43 +00:00
hughchen
e94b02206e Use BluetoothAdapter instead of LocalBluetoothAdapter
LocalBluetoothAdapter only has a few APIs that is not supported
by BluetoothAdapter, and lots of LocalBluetoothAdapter function
pass parameter to BluetoothAdapter directly.
Do the refactor in Settings, use BluetoothAdapter instead of
LocalBluetoothAdapter.

Bug: 111769754
Test: make -j42 RunSettingsRoboTests
Change-Id: I88e5a8377b5d1106c7679e6a8c3fd1ca1a80ea6f
2018-07-31 11:35:36 +08:00
Fan Zhang
37f805a192 Remove BluetoothFeatureProvider and impl
It's not used by anything

Change-Id: I03a73461a391657b8efbce13670a0c92fc4e3565
Fixes: 111940586
Test: rebuild
2018-07-30 11:00:04 -07:00
Alexey Kuzmin
ee2f899a8b Add a reason field to vibrator service
Test: Run vibration test, see reason written to log and trace
Bug: 109654229
Change-Id: I5dbe9a5ff666535f02b5606f18438255ec8a50e8
2018-07-27 20:34:22 +01:00
TreeHugger Robot
6cf7a6e564 Merge "Move logic from SavedAccessPoint fragment to controller" 2018-07-19 23:07:09 +00:00
Fan Zhang
2ff710a911 Move logic from SavedAccessPoint fragment to controller
Change-Id: Ic54e536f97490cec1746fa58c42ec55b60d17f0e
Fixes: 64806699
Test: robotests
2018-07-19 14:49:14 -07:00
TreeHugger Robot
39bb6cec3e Merge "Make app predicates singleton" 2018-07-19 18:50:36 +00:00
jackqdyulei
341ad63da7 Make app predicates singleton
1. AppLabelPredicate
2. AppRestrictionPredicate

Change-Id: I1fd8611c5dd7ffa6318bcb23de7a973c111910b6
Fixes: 111323520
Test: RunSettingsRoboTests
2018-07-19 10:51:42 -07:00
Raff Tsai
0f4affb9a0 Merge "Fix AlertDialog corner and color accent" 2018-07-19 01:00:28 +00:00
tmfang
1d44acce67 Fix test cases broken
- AndroiX AlertDialog needs to use Theme.AppCompat.
- Create a ShadowAlertDialogCompat which can be compatible with AndroidX AlertDialog.

Fix: 111247403
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.password.ChooseLockTypeDialogFragmentTest

Change-Id: I3e4bca285ecaefa5705c8d170050c21d1bc649e0
2018-07-18 19:39:39 +08:00
Raff Tsai
0810afee9b Fix AlertDialog corner and color accent
- Add some attributes in Theme.AlertDialog

Change-Id: Ifb9ca98ee11f6c82cda4a576d10b5fde54f788be
Fixes: 110917586
Test: mannual
2018-07-18 15:40:51 +08:00
Fan Zhang
0a80d936f8 Fix 2 tests broken by fragment migration.
Change-Id: Ieda64e5c2ed9ca43158ce361f79eff9c6b35f464
Fixes: 111194289
Test: robotests
2018-07-12 16:38:26 -07:00
tmfang
f12e6adcdc Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases.
In this CL, some test cases are broken.
So, We ignored these test cases temporarily.

Test: make RunSettingsRoboTests -j56
Bug: 110259478
Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
2018-07-11 18:24:51 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
2018-07-11 18:23:51 -07:00
Doris Ling
30692040be Set default display timeout if current value is disabled by admin.
- The display timeout dialog will only show values that are allowed by the
admin. If the current display time out is greater than the max timeout set by
admin, it becomes an invalid selection. In this case, instead of not
selecting anything, set the default to the last available item.
- move TimeoutListPreference into display package.

Change-Id: I6c88f72ff2b0afe8605800074fd4626bbb16bee0
Fixes: 110104437
Test: make RunSettingsRoboTests
2018-06-25 13:44:00 -07:00
Fan Zhang
7431c91de6 Remove search indexing pipeline from Settings
Index is already handled by SettingsIntelligenec. No longer needed in
Settings.

Change-Id: Id43fb3100dc2759185744441cff8cb9cd2d2da20
Fixes: 69808376
Test: robotests
2018-06-21 09:38:36 -07:00
TreeHugger Robot
e29dd30c74 Merge "Remove unused shadow" 2018-06-20 18:17:53 +00:00
Fan Zhang
3739508a75 Remove unused shadow
Bug: 110403709
Test: robotests
Change-Id: Ic653308e500df33399e091c70a98a8cc594baeeb
2018-06-19 16:42:54 -07:00
Fan Zhang
807dfbb0ad Misc tweaks to create shortcut handler
- Add restriction to only allow system apps provide shortcuts
- Load icon from target package when building shortcut icons
- Codestyle clean up

Change-Id: If9e5c5e60601efda216ce2cc2d4fd7beb44279e1
Fixes: 110393916
Test: visual, robotests
2018-06-19 12:42:18 -07:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Fan Zhang
c39238c63f Add a switchbar to turn off multi-user feature entirely
Change-Id: Ibf88bf37899af5065c68aeb2337acd4ee48bc13c
Fixes: 72319180
Test: robotest on new controller. Manual test on UserSettings fragment.
2018-06-11 15:00:08 -07:00
TreeHugger Robot
e716b47d60 Merge "Check EnforcedAdmin to see if location is locked down by device policy." 2018-06-09 01:23:26 +00:00
Maurice Lam
681ac5bcc3 Fix Robolectric tests
Test: atest RunSettingsRoboTests
Change-Id: I66a6d1c42d57685c4beb9daeb534685c5cdd9c50
2018-06-07 13:12:50 -07:00
yuemingw
a2a593dd3b Check EnforcedAdmin to see if location is locked down by device policy.
Bug: 78563793
Test: m -j RunSettingsRoboTests
and manually via TestDPC

Change-Id: Iad2f11bde51bf6c321beb3c4709d53971a8e40c7
2018-06-06 13:46:40 +01:00