Lei Yu
d85bdebe0e
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
am: 67e38774ce
2017-05-18 17:08:33 +00:00
Lei Yu
67e38774ce
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
* changes:
Drop the misc and not smear it.
Smear screen power usage based on activity time.
2017-05-18 17:00:27 +00:00
jackqdyulei
7d7080ab64
Drop the misc and not smear it.
...
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
2017-05-17 18:12:03 -07:00
Fan Zhang
60d26cfffa
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
...
am: 2b030aeb65
2017-05-18 01:11:00 +00:00
jackqdyulei
2b923ce44f
Smear screen power usage based on activity time.
...
Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
2017-05-17 18:06:47 -07:00
Fan Zhang
c754f59fb0
Fix bug where accounts are duplicated in user&account list.
...
This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.
- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.
Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix: 34035653
Test: make RunSettingsRoboTests
2017-05-17 23:50:30 +00:00
Youhan Wang
c6b1845d0f
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
...
am: 350ba4a4c3
2017-05-17 23:42:49 +00:00
Youhan Wang
350ba4a4c3
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
2017-05-17 23:38:08 +00:00
Antony Sargent
3afb6616c6
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
...
am: c439202da9
2017-05-17 19:12:43 +00:00
TreeHugger Robot
c439202da9
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
2017-05-17 18:59:54 +00:00
Matthew Fritze
a939959838
Merge "Remove duplicates from sound settings" into oc-dev
...
am: 3abeba07d3
2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
...
am: 4bd0f411ce
2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3
Merge "Remove duplicates from sound settings" into oc-dev
2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
2017-05-17 18:28:35 +00:00
Kenny Guy
020dd7b169
Merge "Disable managed profile version of shortcut picker." into oc-dev
...
am: c760135f14
2017-05-17 17:43:44 +00:00
TreeHugger Robot
c760135f14
Merge "Disable managed profile version of shortcut picker." into oc-dev
2017-05-17 17:38:30 +00:00
Matthew Fritze
d53409356d
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
...
am: 09dbc8043f
2017-05-17 17:37:51 +00:00
TreeHugger Robot
09dbc8043f
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
2017-05-17 17:27:57 +00:00
Matthew Fritze
70db53a8d5
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
...
am: 915f0cea5b
2017-05-17 17:26:07 +00:00
TreeHugger Robot
915f0cea5b
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
2017-05-17 17:17:14 +00:00
Matthew Fritze
79cfaa7b91
Merge "Remove default app duplicates in search" into oc-dev
...
am: 0c55014b88
2017-05-17 17:14:24 +00:00
Matthew Fritze
5a151d23ab
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
...
am: 564b965ccc
2017-05-17 17:13:46 +00:00
TreeHugger Robot
0c55014b88
Merge "Remove default app duplicates in search" into oc-dev
2017-05-17 17:08:12 +00:00
TreeHugger Robot
564b965ccc
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
2017-05-17 17:06:18 +00:00
Kenny Guy
4761da3b73
Disable managed profile version of shortcut picker.
...
Don't show managed profile version of shortcut
picker as it lunaches same activities as personal
one.
Test: manual - check badged shortcut isn't present in launcher.
Bug: 38333213
Change-Id: Iade6595255524a8dbf223a70a6c8312087258c23
2017-05-17 16:44:01 +01:00
Charles He
af36129ae9
Merge "Properly remove fingerprints when removing device lock." into oc-dev
...
am: 98229bdf32
2017-05-17 13:04:40 +00:00
Charles He
98229bdf32
Merge "Properly remove fingerprints when removing device lock." into oc-dev
2017-05-17 12:58:21 +00:00
Matthew Fritze
f8b8ecebea
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
...
am: bcb2565e05
2017-05-17 04:46:15 +00:00
TreeHugger Robot
bcb2565e05
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62
Revert "Replace dynamic summary text for SettingPref"
...
This reverts commit 03dfa50996
2017-05-17 02:56:28 +00:00
Youhan Wang
c426fe6c68
TelephonyMonitor: Replace boolean decision with multiple status.
...
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40
Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,
Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
2017-05-17 01:11:53 +00:00
Matthew Fritze
06976317cb
Remove duplicates from sound settings
...
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
2017-05-16 15:58:54 -07:00
Matthew Fritze
c6192251b2
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
...
am: d6aa9f3454
2017-05-16 22:44:49 +00:00
Matthew Fritze
6fe35bb031
Remove Backup and Reset duplicates from Settings search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
2017-05-16 15:43:21 -07:00
Charles He
7569bb1881
Properly remove fingerprints when removing device lock.
...
When strong auth (PIN, password, or pattern) is removed from a user,
fingerprints enrolled for that user should also be removed. Then, if the
user has a work profile guarded by a unified work challenge, the work
profile's fingerprints should also be removed.
Previously, when removing the fingerprints of the current user,
ChooseLockGeneric checked the finger id of the onRemovalSucceeded() and
onRemovalError() callbacks, and assumed the removal had completed when
the id was 0. Only after this would it initiate the removal of work
profile fingerprints, if any.
However, the finger id is actually non-zero even for the user's last
fingerprint. This means the work profile fingerprints (under unified
challenge) were never removed. Another more visible symptom was that
when the user removed the device lock by choosing "None" or "Swipe" in
ChooseLockGeneric, the activity failed to exit, since finish() is called
only at the end of the removal flow which was not executed.
In this CL, we check the number of remaining fingerprints instead of
relying on the finger id, thus allowing the removal flow to complete and
the activity to finish().
Bug: 37938345
Test: manual, both with and without work profile
Test: make SettingsRoboTests
Change-Id: Ic04fd01177ad6d4a061023a4b6889af585f8f2b7
2017-05-16 23:40:38 +01:00
Matthew Fritze
2e89758b01
Remove Legal Information duplicate from Settings search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
2017-05-16 15:39:03 -07:00
TreeHugger Robot
d6aa9f3454
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
2017-05-16 22:37:22 +00:00
Matthew Fritze
8b0ed39c11
Remove Network Restrictions duplicate from setting search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I6b1aef6102811a6ad25d2da43993441c6e56006c
2017-05-16 14:35:19 -07:00
Antony Sargent
f1d544f945
Add a "Use high quality audio" option to Bluetooth A2DP device settings
...
This change adds a checkbox reading "Use high quality audio: <codec
name>" to the details dialog for A2DP audio bluetooth devices that
support codecs other than the mandatory SBC (eg AAC, LDAC, aptX, etc.).
Bug: 37441685
Test: make RunSettingsRoboTests
Change-Id: I6e5423db11a0cd7fe0b1141dd998e7c936c240f0
2017-05-16 11:02:52 -07:00
Daniel Nishi
90c963b1fa
Merge "Fix a bug where storage settings flickers." into oc-dev
...
am: 1da7123930
2017-05-16 17:07:34 +00:00
Daniel Nishi
1da7123930
Merge "Fix a bug where storage settings flickers." into oc-dev
2017-05-16 17:01:30 +00:00
Shinji Sogo
183aed6dd6
Merge "Show security info in saved network list" into oc-dev
...
am: ecd1df1076
2017-05-16 15:33:36 +00:00
TreeHugger Robot
ecd1df1076
Merge "Show security info in saved network list" into oc-dev
2017-05-16 15:25:53 +00:00
Matthew Fritze
1f21e7f325
Merge "Replace dynamic summary text for SettingPref" into oc-dev
...
am: 49b86b5c6a
2017-05-16 00:12:07 +00:00
TreeHugger Robot
49b86b5c6a
Merge "Replace dynamic summary text for SettingPref" into oc-dev
2017-05-15 23:46:18 +00:00
Doris Ling
071aa6b88b
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
...
am: d821a32b8e
2017-05-12 22:06:32 +00:00
TreeHugger Robot
d821a32b8e
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
2017-05-12 21:54:22 +00:00
Fan Zhang
2fdb45913b
Merge "Add a no-op activity to handle development setting intent." into oc-dev
...
am: 0036ef2cf0
2017-05-12 20:42:53 +00:00
TreeHugger Robot
0036ef2cf0
Merge "Add a no-op activity to handle development setting intent." into oc-dev
2017-05-12 20:16:20 +00:00
Matthew Fritze
031af9f287
Remove Wallpaper duplicate from setting search
...
Bug: 33701673
Test: make -j40 RunSettingsRoboTests
Change-Id: I520cbc74284d92ab05b733346ee1b3115ddd8e9f
2017-05-12 12:00:48 -07:00
