Commit Graph

41712 Commits

Author SHA1 Message Date
TreeHugger Robot
db60997f2a Merge changes I145c2e25,I4abe87dd,I86575d17,I90a0e583
* changes:
  Introduce BluetoothAudioQualityPreferenceCtrl
  Introduce BluetoothAudioChannelModePreferenceCtrl
  Introduce BluetoothAudioBitsPerSamplePrefCtrl
  Introduce BluetoothAudioCodecPreferenceController
2017-10-17 21:31:27 +00:00
jeffreyhuang
142682c19c Hide dev options v1 under feature flag
- Cutover to DevelopmentSettingsDashboardFragment
 - Add dev_option_v1 feature flag

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I2ff7b5c55f1f27cd24b4e276d3d81a73f67dcf88
2017-10-17 13:49:19 -07:00
TreeHugger Robot
47775667b8 Merge "Add work-only-category controller" 2017-10-17 19:10:29 +00:00
jeffreyhuang
af3ec754dd Introduce BluetoothAudioQualityPreferenceCtrl
- Create new BluetoothAudioQualityPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I145c2e2554f5e9f5e7cfa79b3f6198a8b81105ec
2017-10-17 11:18:06 -07:00
jeffreyhuang
2335b1fef4 Introduce BluetoothAudioChannelModePreferenceCtrl
- Create new BluetoothAudioChannelModePreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I4abe87dd70be83c8b3cf2a3ad43b8856a01eadbb
2017-10-17 11:18:06 -07:00
jeffreyhuang
483dc97998 Introduce BluetoothAudioBitsPerSamplePrefCtrl
- Create new BluetoothAudioBitsPerSamplePreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I86575d171a005f62f731d9001f08ddcf976ad826
2017-10-17 11:18:06 -07:00
jeffreyhuang
0ef326f365 Introduce BluetoothAudioCodecPreferenceController
- Create new BluetoothAudioCodecPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I90a0e58328196315fccbecd6d46531b4f0fcaef1
2017-10-17 11:18:06 -07:00
Pavel Grafov
24ff765731 Preserve old password when handling SET_NEW_PASSWORD. am: 40e187b364
am: 51f15da8e6

Change-Id: I9b46697d14579ab8aedfffcdfd14ddc02cad5cf0
2017-10-17 17:35:30 +00:00
Fan Zhang
1bde0d84b0 Add work-only-category controller
The controller will hide category if there is no child in it.

Change-Id: I9bbcc4115b991574e608933f98857b0b4eb2ed7d
Fixes: 62185871
Test: robotests
2017-10-17 10:34:36 -07:00
Pavel Grafov
51f15da8e6 Preserve old password when handling SET_NEW_PASSWORD.
am: 40e187b364

Change-Id: I45a464c244b6de3a4ea491d28db620425733b5a8
2017-10-17 17:33:23 +00:00
Jeffrey Huang
9b117ef690 Merge "Lazy load SettingsObserver" 2017-10-17 17:22:31 +00:00
TreeHugger Robot
ec234edcc1 Merge "Adjusted char limits and media/system string." 2017-10-17 16:04:20 +00:00
Beverly
052ac3d84e Adjusted char limits and media/system string.
Change-Id: Iad4d9980fc52970d1ee8221053dd116c5bbcd9cb
Fixes: 67821000
Fixes: 67827886
Fixes: 67820998
Test: manual
2017-10-17 09:45:56 -04:00
Pavel Grafov
40e187b364 Preserve old password when handling SET_NEW_PASSWORD.
Currently the only way mUserPassword can be set is when it comes
from onActivityResult. This way when the user chooses "Continue
without Pixel Imprint", and we switch ChooseLockGeneric->InternalActivity,
mUserPassword becomes null (it is not preserved in intent extras).
And then this null is used in getLockPasswordIntent which causes the issue.

Another issues is that when the user chooses to use fingerprint,
mHasChallenge is set to true and password is not forwarded to
ChooseLock(Password|Pattern). I changed the intent builders so that both
old password and challenge can be sent at the same time, so the password
is not lost when fingerprint is set.

Bug: 67672081
Test: cd packages/apps/Settings/tests/robotests/ && mma
Test: manual, adb shell am start -a android.app.action.SET_NEW_PASSWORD,
      tried setting pin/password with and without fingerprint.
Test: manual, tried to change lock via Settings -> Security&Location
Test: manual, set pin + fingerprint in Setup Wizard, FBE and FDE devices
Test: manual, set pin + added account, used pin to unlock FRP in SUW
Change-Id: I38d56d84f95c63fef24c2aa1a031d629f22756a1
2017-10-17 13:19:35 +01:00
TreeHugger Robot
ffa3095aca Merge "Add advanced button to security & location page" 2017-10-17 02:09:45 +00:00
TreeHugger Robot
84f1e3003a Merge "Reorder default app summary to match subpage ordering" 2017-10-17 01:15:45 +00:00
Fan Zhang
069830012f Add advanced button to security & location page
Change-Id: I45977105d6ddabef8f2d9bdc7b46959af9cbbf0f
Fixes: 36657221
Test: visual
2017-10-16 17:39:27 -07:00
jeffreyhuang
17edf20fa5 Lazy load SettingsObserver
- Lazy load the SettingsObserver in StayAwakePreferenceController
 so that search indexing works properly

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I1e2afb106ce293f616143da3f37fbde3829f414f
2017-10-16 16:56:26 -07:00
Fan Zhang
11e9123036 Reorder default app summary to match subpage ordering
Change-Id: I618f44ba8cf6f590b86d483cfecb090b71ef1268
Fixes: 65049890
Test: robotests
2017-10-16 16:42:27 -07:00
Cai, Min1
573f3d5917 Merge "Refresh payment preference while resume" am: 05650bb3da am: 088baf348b am: f523ca10aa
am: 84a60e3cf3

Change-Id: I037f72265acc57e531edc337e3e523ece20063a3
2017-10-16 21:45:23 +00:00
Maurice Lam
b8cf5a03a4 resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302 am: 0e1c486e74
am: c03cf0092e  -s ours

Change-Id: Ie9d2e04136be07b90bdb49f4fcceb259c95dee4a
2017-10-16 21:43:55 +00:00
Cai, Min1
84a60e3cf3 Merge "Refresh payment preference while resume" am: 05650bb3da am: 088baf348b
am: f523ca10aa

Change-Id: I25dea8b9ddb1740c907d4ef79c74fe8b201352a2
2017-10-16 19:59:50 +00:00
Cai, Min1
f523ca10aa Merge "Refresh payment preference while resume" am: 05650bb3da
am: 088baf348b

Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d
2017-10-16 19:41:44 +00:00
Cai, Min1
088baf348b Merge "Refresh payment preference while resume"
am: 05650bb3da

Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
2017-10-16 19:29:33 +00:00
Maurice Lam
c03cf0092e resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302
am: 0e1c486e74

Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e
2017-10-16 19:25:57 +00:00
Maurice Lam
0e1c486e74 resolve merge conflicts of f36b25c2df to stage-aosp-master
am: d4621f6302

Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0
2017-10-16 19:22:12 +00:00
Maurice Lam
d4621f6302 resolve merge conflicts of f36b25c2df to stage-aosp-master
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
2017-10-16 18:31:40 +00:00
Jeffrey Huang
826ee4d38f Merge "Restore state when activity is destroyed" 2017-10-16 17:15:29 +00:00
Jeffrey Huang
79c1a5944f Merge "Introduce FreeformWindowsPreferenceController" 2017-10-16 17:15:17 +00:00
Jeffrey Huang
82f8a3deba Merge "Introduce BackgroundProcessLimitPreferenceCtrl" 2017-10-16 17:15:05 +00:00
Jeffrey Huang
914d623984 Merge "Introduce ProfileGpuRenderingPreferenceController" 2017-10-16 17:14:53 +00:00
Jeffrey Huang
092d5ba968 Merge "Introduce SetGpuRendererPreferenceController" 2017-10-16 17:14:41 +00:00
Eric Schwarzenbach
d675c2066a Change network detail page title.
Changes WifiNetworkDetailPage title string from "Network info" to
"Network details" to match the Bluetooth device detail page title.

Bug: 67470790
Test: visual
Change-Id: I7e023f8c8d539c5686a2f95eee3f956f9d5649f1
2017-10-16 09:54:49 -07:00
Daniel Nishi
02909bd9e6 Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77 am: f1dc9e65f1
am: ab80b6ee9c

Change-Id: I8dd477c65898f92954868d5ab25b12ffabfe3d0a
2017-10-15 05:34:44 +00:00
Doris Ling
4930065f3a Update tile limit for Sound settings. am: 893bdba206
am: 15d06244d3

Change-Id: Ib307fc04adea4b7371f5234fa0c5c0813ff7b41e
2017-10-15 05:33:47 +00:00
Daniel Nishi
ab80b6ee9c Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77
am: f1dc9e65f1

Change-Id: Ib55d4b211b48f4a6e18034f60d91f43748aebe89
2017-10-15 04:30:40 +00:00
Daniel Nishi
f1dc9e65f1 Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
am: 5973d32c77

Change-Id: I66747a250e7461cfc3fe04fb8228bb7fe7541b5a
2017-10-15 03:59:02 +00:00
Daniel Nishi
5973d32c77 Merge "Fix PrivateVolumeSettings be launched repeatedly"
am: 31a7b2a4c7

Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
2017-10-15 03:47:13 +00:00
Doris Ling
15d06244d3 Update tile limit for Sound settings.
am: 893bdba206

Change-Id: Ie73472f54d737ae8058ff95a65d16068750ace24
2017-10-15 02:43:43 +00:00
TreeHugger Robot
43e86cefc9 Merge "Exempt res folder from OWNERS approval." 2017-10-14 00:25:41 +00:00
TreeHugger Robot
99111a92e8 Merge "Remove WifiNetworkScoreCache fake" 2017-10-14 00:08:28 +00:00
Kevin Chyn
5132e29d6e Fingerprint enrolling should update UI while in multi-window mode
Fixes: 67652597

Test: Try enrolling fingerprint while in multi-window mode, with and
      without focusing the FP Settings activity

Test: Enrolling doesn't occur when FP Settings activity is not shown
      (ie home button pressed)

Change-Id: Ie467da767ae36eb8d3c2b956754272749dffb43fu
2017-10-13 23:27:45 +00:00
Fan Zhang
7ad17d72ad Merge "Encapsulate AppFilter and its display label into 1 class" 2017-10-13 23:24:05 +00:00
Treehugger Robot
05650bb3da Merge "Refresh payment preference while resume" 2017-10-13 23:10:13 +00:00
Fan Zhang
9dae6ada85 Exempt res folder from OWNERS approval.
Test: rebuild
Change-Id: I4ba7e5d02985f62811fa89d2fd5d2667aa0b441d
2017-10-13 15:59:03 -07:00
jeffreyhuang
4eda4b3152 Restore state when activity is destroyed
- Fixes a bug where developer options would be re-enabled
 if the activity is destroyed when the master switch is set to
 off

Bug: 34203528
Test: Manual testing with screen rotation
Change-Id: Ic8e04858f6e3dd2353feb6fa94be9f420ab8adbb
2017-10-13 15:44:03 -07:00
Treehugger Robot
f36b25c2df Merge "There is no NEXT button in find sensor screen of fingerprint." 2017-10-13 21:45:18 +00:00
Fan Zhang
bd56215962 Encapsulate AppFilter and its display label into 1 class
Bug: 64804294
Test: robotests
Change-Id: I2a752794ded4ccb8510adf37d41afa4514d8c4c0
2017-10-13 14:33:11 -07:00
TreeHugger Robot
aad3b1cef2 Merge "Use ButtonBarLayout to stack buttons" 2017-10-13 20:12:49 +00:00
TreeHugger Robot
909df8b966 Merge "There is no NEXT button in find sensor screen of fingerprint." 2017-10-13 20:11:09 +00:00