Commit Graph

36277 Commits

Author SHA1 Message Date
Steven Ng
14153fd25b Fix phishing attack in ChooseLockGeneric
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
2017-05-15 17:53:22 +00:00
Steven Ng
741f99ad22 Fix phishing attack in ChooseLockGeneric
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
2017-05-15 17:52:44 +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
Bill Yi
5230ffe3a5 Import translations. DO NOT MERGE am: 3b2d98c714 -s ours
am: e77c92c991  -s ours

Change-Id: Ie39f8fff5d0c92826a21958abde00034b9d481db
2017-05-13 06:57:44 +00:00
Bill Yi
e77c92c991 Import translations. DO NOT MERGE
am: 3b2d98c714  -s ours

Change-Id: I425cc59dacedac1c97d92e700ad1e0e93bd0a089
2017-05-13 06:51:12 +00:00
TreeHugger Robot
d1e4ece2c3 Merge "Import translations. DO NOT MERGE" 2017-05-13 06:21:14 +00:00
Maurice Lam
9f1a44599b Merge "Clean up choose lock intent creation" 2017-05-13 00:43:51 +00:00
Bill Yi
3b2d98c714 Import translations. DO NOT MERGE
Change-Id: I2906d6bf999dccdec191f285f73e04fe52f4c2a4
Auto-generated-cl: translation import
2017-05-12 17:11:09 -07:00
Bill Yi
9490c36598 Import translations. DO NOT MERGE
Change-Id: Ie0fc2f56d626dffbb2b7ca902d8c327f5a9f544c
Auto-generated-cl: translation import
2017-05-12 17:05:00 -07:00
Phil Weaver
eb1a7f924f Merge "Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours am: 1c3120f196" into oc-dev-plus-aosp
am: 4ccb4fd19e

Change-Id: Icd1ebbacea32b3936fca27b2188b2feb22f603db
2017-05-12 23:47:03 +00:00
Phil Weaver
f7ef513e03 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 am: 8f58e8b6e9 -s ours
am: be70654977

Change-Id: Ic03df1054b81144134968fb46fecbb07df43a823
2017-05-12 23:46:18 +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
Android Build Merger (Role)
4ccb4fd19e Merge "Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours am: 1c3120f196" into oc-dev-plus-aosp 2017-05-12 22:22:16 +00:00
Phil Weaver
be70654977 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97
am: 8f58e8b6e9  -s ours

Change-Id: Ib9fcc7305964fc16152ed86d16d42b48113b5c0d
2017-05-12 22:21:56 +00:00
Phil Weaver
4f004a719c Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours
am: 1c3120f196

Change-Id: I990f591be5bc0f596c910037e362ecee84c9ed9b
2017-05-12 22:21:56 +00:00
Phil Weaver
1c3120f196 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
am: 611fda4a97  -s ours

Change-Id: I1e12d774e57528af8f263e36d64af95e9d5c23b0
2017-05-12 22:19:53 +00:00
Phil Weaver
8f58e8b6e9 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
am: 611fda4a97

Change-Id: I5dfd4f444b4d13c139d8119f0e879fe71de20ad2
2017-05-12 22:17:54 +00:00
Phil Weaver
611fda4a97 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239
am: 7f1bc85e4c

Change-Id: I3f92db015ad60b8e6257a71153a58a7883c1cac7
2017-05-12 22:16:26 +00:00
Phil Weaver
7f1bc85e4c Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a
am: 8247008239

Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a
2017-05-12 22:14:22 +00:00
Phil Weaver
8247008239 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
am: 9b8abd652a

Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
2017-05-12 22:11:56 +00:00
Phil Weaver
9b8abd652a Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4
am: adf8f8bc60

Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67
am: 11b6279ed4

Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
2017-05-12 22:07:24 +00: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
Phil Weaver
11b6279ed4 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
am: beb7f31d67

Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e

Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e Don't enable a11y service if scary dialog obscured
am: 9a1b4eb21f

Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
2017-05-12 22:00:23 +00:00
TreeHugger Robot
d821a32b8e Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev 2017-05-12 21:54:22 +00:00
TreeHugger Robot
1949776c59 Merge "Hide app info link for "All work apps" data usage detail" 2017-05-12 21:31:09 +00:00
Fan Zhang
64ea8403bf Merge "Add a no-op activity to handle development setting intent." into oc-dev am: 0036ef2cf0
am: 2fdb45913b

Change-Id: Ib699ffe15a91fdaa1cbfbb788f4b0ee92752174a
2017-05-12 20:59:40 +00:00
Fan Zhang
2fdb45913b Merge "Add a no-op activity to handle development setting intent." into oc-dev
am: 0036ef2cf0

Change-Id: I116509d6ee62fd0633729f832cf88e4e9d9c6708
2017-05-12 20:42:53 +00:00
Juan Lang
a5f0a82f8f Merge changes from topic 'footer-settingslib'
* changes:
  Depend on SettingsLib's version of lifecycle and FooterMixin.
  Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +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
Sudheer Shanka
b13d0c5d2f Merge "Update FakeUid to include new methods." into oc-dev am: 129369e58e
am: 2c49941e5a

Change-Id: Ie6ee2d4f97d604c11c76617c427b2e4175173b92
2017-05-12 18:18:33 +00:00
TreeHugger Robot
2270c87100 Merge "Revert "Revert "Filter and display top 3 suggestions for exclusive type""" 2017-05-12 18:14:49 +00:00
Fan Zhang
59fd017ce5 Revert "Revert "Filter and display top 3 suggestions for exclusive type""
This reverts commit 184ae963e7.

Change-Id: Iac60fc52a5b0c153945c22b97394546a529d3bb4
2017-05-12 18:12:58 +00:00
Juan Lang
777ed2535a Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
2017-05-12 11:10:46 -07:00
Sudheer Shanka
2c49941e5a Merge "Update FakeUid to include new methods." into oc-dev
am: 129369e58e

Change-Id: I0f6ac2bd7ba43d31843c61b0478cfd39fb20da0d
2017-05-12 18:09:55 +00:00
Fan Zhang
e19209a42c Merge "Revert "Filter and display top 3 suggestions for exclusive type"" 2017-05-12 18:06:51 +00:00
Fan Zhang
184ae963e7 Revert "Filter and display top 3 suggestions for exclusive type"
This reverts commit 70b634adcf.

Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
2017-05-12 18:03:58 +00:00
Sudheer Shanka
129369e58e Merge "Update FakeUid to include new methods." into oc-dev 2017-05-12 18:02:44 +00:00
Shinji Sogo
8b23c35954 Show security info in saved network list
When an access point linked to a saved network is not found,
security info should be shown in dialog of saved network.
Notes that in Android N this list is created with saved networks
and scan result, and that causes security info is not shown for
access points seen around user, but in Android O only saved
networks are used to create a list. That means security info is
shown for all access points listed in the screen.

Bug: 38102896
Test: make RunSettingsRoboTests

Change-Id: Ia0c5184ae7a1325f2628f4c08e29350c5793a08f
(cherry-pick of a8382c11f58ecbfbc5b8d908b97c53d59cf774fe)
2017-05-12 10:35:08 -07:00
Doris Ling
2f02218493 Change AppPrefLoader from AsyncTask to AsyncLoader.
Showing the wifi data usage results in reaching the max number of
threads in the pool executor. Switching the loader implementation
from Async task to AsynLoader and use a single loader to get the
whole list of preferences instead of using a new task to create each
list element.

Change-Id: I0da19ca09031a7fa178970c192e12a99ab489145
Fix: 33820327
Test: make RunSettingsRoboTests
2017-05-12 10:34:20 -07:00
TreeHugger Robot
96e6f69597 Merge "Filter and display top 3 suggestions for exclusive type" 2017-05-12 17:28:35 +00:00
Fan Zhang
470caeaa80 Hide app info link for "All work apps" data usage detail
We should hide the link because "All work apps" is a meta app, it
doesn't point to any specific app, so app info link does not make sense.

Change-Id: I768786f2df5d05bbde0723e5585abcdbe875c652
Fix: 36542896
Test: make RunSettingsRoboTests
2017-05-12 10:21:33 -07:00
Daniel Nishi
7bb541b6ff Fix a bug where storage settings flickers.
The bug resulted from the fact that turning off loading while loading is
turned off causes the loading finishing animation to flicker. By only
turning it off when it is on, we ensure it works.

Change-Id: Ia31bf3e9aa90726e39b6bc7189d175c38fb51e5a
Fixes: 38045492
Test: Manual
2017-05-12 09:43:00 -07:00