Commit Graph

17038 Commits

Author SHA1 Message Date
Matthew Fritze
f81f1024c3 Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b
am: 70db53a8d5

Change-Id: I03de10d23f3d9a74ee08fdb6a711400e3e0468cf
2017-05-17 17:31:08 +00:00
Matthew Fritze
70db53a8d5 Merge "Remove Legal Information duplicate from Settings search" into oc-dev
am: 915f0cea5b

Change-Id: I508afeb3b832ffc444fa5dafe4836fc0ae202eb0
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

Change-Id: I1beb3569054d6acbcd9f22d112031de51b862dc9
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

Change-Id: If022852ca522b4d3f2fc8a01a9e96b966ab98cfa
2017-05-17 17:16:47 +00:00
Matthew Fritze
79cfaa7b91 Merge "Remove default app duplicates in search" into oc-dev
am: 0c55014b88

Change-Id: I62f5fbd444836aa73b6ff801bad944c9a8fddd4b
2017-05-17 17:14:24 +00:00
Matthew Fritze
5a151d23ab Merge "Remove Wallpaper duplicate from setting search" into oc-dev
am: 564b965ccc

Change-Id: I955360c67d040a7c05685e8928e54dc6ac1109b6
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
Charles He
80c3a16e92 Merge "Properly remove fingerprints when removing device lock." into oc-dev am: 98229bdf32
am: af36129ae9

Change-Id: Iffc4f16ac3301bc0fbe9b4d8a1c88b3e71ce2373
2017-05-17 13:12:00 +00:00
Charles He
af36129ae9 Merge "Properly remove fingerprints when removing device lock." into oc-dev
am: 98229bdf32

Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6
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

Change-Id: I4ae1d981c928e1b61d555d129723b7dabafd439c
2017-05-17 04:48:50 +00:00
Matthew Fritze
f8b8ecebea Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
am: bcb2565e05

Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
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.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
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

Change-Id: Ia442b29148675a291aca2b317c398bf285b3a2eb
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

Change-Id: I0ae7c3ec171d1954a362c908ea73a8a5741f2554
2017-05-16 22:44:49 +00: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
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.
Fix: 38347840
Test: make RunSettingsRoboTests
Change-Id: Ia366db7d9779c14a1b8cbe86e509bc54c9eee658
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

Change-Id: I46fa3abdf3843b442b5ff484e74ae91d41eb68bd
2017-05-16 17:14:02 +00:00
Daniel Nishi
90c963b1fa Merge "Fix a bug where storage settings flickers." into oc-dev
am: 1da7123930

Change-Id: I1cfe2b00a37e26d0e4f7c6806fadb601c5fdb617
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

Change-Id: Ib479ee98d5c6500954e5dede317f46c19bc2aca6
2017-05-16 15:39:57 +00:00
Shinji Sogo
183aed6dd6 Merge "Show security info in saved network list" into oc-dev
am: ecd1df1076

Change-Id: I068abbefd82c0447e474d6db6c38a56ea4703217
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

Change-Id: Ie231837dc4ae0f4f94f326f67c06dfc2eb79ce4e
2017-05-16 01:56:55 +00:00
Matthew Fritze
1f21e7f325 Merge "Replace dynamic summary text for SettingPref" into oc-dev
am: 49b86b5c6a

Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
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
Pankaj Kanwar
9e8a182c31 Merge "Remove Sleep options from Advanced wifi." 2017-05-15 20:23:18 +00:00
Fan Zhang
9834bd82da Update strings in special app access and dev options
- Change all yes/no or on/off strings in special app access to
  Allowed/Not allowed
- Remove some dead code in related files
- Add a toast string in DevelopmentSettingsDisabledActivity to prompt
  user enable dev options before use.
- Add search in SpecialAccessSettings

Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf
Fix: 38290299
Fix: 37469224
Test: make RunSettingsRoboTests
2017-05-15 13:22:51 -07:00
TreeHugger Robot
f952789285 Merge "Add pairing preference" 2017-05-15 20:12:45 +00:00
jackqdyulei
1b853c5597 Add pairing preference
This preference lives in paired category. When clicked, it will
go to the pairing page.

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: I64706c49c8d303a494d4c1827e1f86b59effd54c
2017-05-15 10:46:28 -07:00
Fan Zhang
8e0754e84c Correctly report whether the current app is default home.
Change-Id: I79c374228e82c91667d7b5a0dcc19fa1216e57c4
Fix: 38065524
Test: make RunSettingsRoboTests
2017-05-15 10:17:37 -07:00
pkanwar
2fca2ebddf Remove Sleep options from Advanced wifi.
Sleep options are not relevant any more. This CL removes them from the
settings code.

Bug: 35994481
Test: make RunSettingsRoboTests
Change-Id: Ibd0b33ded3aa2da3df73c519611c915deed6310f
2017-05-15 16:39:48 +00:00
Maurice Lam
9f1a44599b Merge "Clean up choose lock intent creation" 2017-05-13 00:43:51 +00:00
Badhri Jagan Sridharan
296e5e3ee6 Merge "Use StartActivityForResult to launch the intent." 2017-05-12 23:21:47 +00:00
Doris Ling
01639b7504 Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b
Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests
2017-05-12 15:51:11 -07:00
Maurice Lam
2eb170cd6f Clean up choose lock intent creation
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.

Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.

Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
2017-05-12 15:35:20 -07:00
Doris Ling
071aa6b88b Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
am: d821a32b8e

Change-Id: If0208dec8535fe72b14f73f42eb56ecfd7c9d2f7
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