Matthew Fritze
c838e959f7
Merge "Remove duplicates from sound settings" into oc-dev am: 3abeba07d3
...
am: a939959838
2017-05-17 19:07:45 +00:00
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
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
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
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
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
Steven Ng
fd72a955c4
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours am: 00266d056c -s ours
...
am: 17bb961066
2017-05-16 21:43:48 +00:00
Steven Ng
470dc125c8
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34 -s ours am: dde4d49385 -s ours
...
am: 25e02bc80c
2017-05-16 21:43:13 +00:00
Steven Ng
17bb961066
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours
...
am: 00266d056c
2017-05-16 21:39:54 +00:00
Steven Ng
00266d056c
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours
...
am: 6496c3757b
2017-05-16 21:36:53 +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
Steven Ng
25e02bc80c
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34 -s ours
...
am: dde4d49385
2017-05-16 21:33:53 +00:00
Steven Ng
6496c3757b
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791
...
am: e05ef08a8e
2017-05-16 21:33:53 +00:00
Steven Ng
dde4d49385
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
...
am: a2af16bb34
2017-05-16 21:30:54 +00:00
Steven Ng
e05ef08a8e
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
...
am: c07f39c791
2017-05-16 21:30:54 +00:00
Christine Franks
6962c1841d
Merge "Fix switch widget in night display preference"
2017-05-16 21:23:22 +00:00
TreeHugger Robot
b7b258e539
Merge "Add title to SeekbarPreference content description."
2017-05-16 21:20:48 +00:00
Steven Ng
a2af16bb34
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
2017-05-16 21:18:13 +00:00
