Matthew Fritze
8cd0562bd6
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce
...
am: af054e63e0
2017-05-17 19:06:59 +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
4bd0f411ce
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
2017-05-17 18:28:35 +00:00
Kenny Guy
31457d5a2a
Merge "Disable managed profile version of shortcut picker." into oc-dev am: c760135f14
...
am: 020dd7b169
2017-05-17 17:53:40 +00:00
Matthew Fritze
256e9e208e
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am: 09dbc8043f
...
am: d53409356d
2017-05-17 17:53:08 +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
Matthew Fritze
f81f1024c3
Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b
...
am: 70db53a8d5
2017-05-17 17:31:08 +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
Matthew Fritze
dffaa57cb1
Merge "Remove default app duplicates in search" into oc-dev am: 0c55014b88
...
am: 79cfaa7b91
2017-05-17 17:17:37 +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
4704356bfb
Merge "Remove Wallpaper duplicate from setting search" into oc-dev am: 564b965ccc
...
am: 5a151d23ab
2017-05-17 17:16:47 +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
80c3a16e92
Merge "Properly remove fingerprints when removing device lock." into oc-dev am: 98229bdf32
...
am: af36129ae9
2017-05-17 13:12:00 +00: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
2d6c7df80b
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev am: bcb2565e05
...
am: f8b8ecebea
2017-05-17 04:48:50 +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
TreeHugger Robot
b900846e8e
Merge "Do not close cursor in onLoadFinished"
2017-05-17 01:24:34 +00:00
Matthew Fritze
61c80c2ab6
Merge "Remove Special App Access duplicate from Setting search" into oc-dev am: d6aa9f3454
...
am: c6192251b2
2017-05-16 22:53:37 +00: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
cf68422c22
Merge "Add SupportDashboardActivity to secondary user home AI"
2017-05-16 22:38:09 +00: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
TreeHugger Robot
b7b258e539
Merge "Add title to SeekbarPreference content description."
2017-05-16 21:20:48 +00:00
Fan Zhang
667d427967
Revert "Update strings in special app access and dev options"
...
This reverts commit 9834bd82da
2017-05-16 13:54:28 -07:00
Fan Zhang
cbfe1eb881
Add title to SeekbarPreference content description.
...
Adding a title to contentDesciption of the seekbar.
The title is helpful to indicate which seekbar user is changing when
talkback is enabled.
Also move SeekBarPreference from root package to widget packge.
Change-Id: I793f41c4902e350b6bc6d62761362779cc3722a9
Fix: 35421942
Test: make RunSettingsRoboTests
2017-05-16 12:35:45 -07:00
Salvador Martinez
8ee06bc775
Add SupportDashboardActivity to secondary user home AI
...
Secondary users could not see the support preference in the
settings home screen because it was missing from the list of
whitelisted activities. This CL adds the SupportDashboardActivity
to the list so that secondary users can see it.
Test: Robotests still pass for SettingsGateway
Change-Id: Ia48dbd5b8d396c1bdf050c102fee0a5cd5300ed2
2017-05-16 18:05:54 +00:00
Salvador Martinez
e74b0637c9
Do not close cursor in onLoadFinished
...
Apparently in cursor loaders you don't need to manually close
the cursor because it does it for you at the end. doing so can
also cause crashes on device configuration changes since it
will call the method again with the same cursor.
Test: robotests still pass
Bug: 38208727
Change-Id: I285e56546daf726e74b903856b17dc034d6fd538
2017-05-16 10:51:41 -07:00
Daniel Nishi
fe32e957c9
Merge "Fix a bug where storage settings flickers." into oc-dev am: 1da7123930
...
am: 90c963b1fa
2017-05-16 17:14:02 +00: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
b8548f762c
Merge "Show security info in saved network list" into oc-dev am: ecd1df1076
...
am: 183aed6dd6
2017-05-16 15:39:57 +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
5a44fe4dad
Merge "Replace dynamic summary text for SettingPref" into oc-dev am: 49b86b5c6a
...
am: 1f21e7f325
2017-05-16 01:56:55 +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
TreeHugger Robot
96d05ef43a
Merge "Update strings in special app access and dev options"
2017-05-15 22:23:02 +00:00
