Commit Graph

35622 Commits

Author SHA1 Message Date
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
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
Bill Yi
dcdc60bab8 Import translations. DO NOT MERGE
Change-Id: Ia166bd3b3e8acd794f43e415b15edbb579c54573
Auto-generated-cl: translation import
2017-05-16 01:42:58 -07: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
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
Bill Yi
e77c92c991 Import translations. DO NOT MERGE
am: 3b2d98c714  -s ours

Change-Id: I425cc59dacedac1c97d92e700ad1e0e93bd0a089
2017-05-13 06:51:12 +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
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
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
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
2c49941e5a Merge "Update FakeUid to include new methods." into oc-dev
am: 129369e58e

Change-Id: I0f6ac2bd7ba43d31843c61b0478cfd39fb20da0d
2017-05-12 18:09:55 +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
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
Julia Reynolds
237eb88434 Merge "Notification settings, importance and pre-O apps" into oc-dev
am: 6393e1752f

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
2017-05-12 12:20:36 +00:00
Julia Reynolds
6393e1752f Merge "Notification settings, importance and pre-O apps" into oc-dev 2017-05-12 12:14:11 +00:00
Amin Shaikh
8485562ded Merge changes from topic 'onarevert' into oc-dev
am: b747be0769

Change-Id: Ia3b7fbe98a5ffc125ffa9e1ebdc677076814be7c
2017-05-12 06:48:13 +00:00
Amin Shaikh
c3666f1c35 Revert "Update "Open networks available" toggle to instead open notification channel preferences."
am: dfa9bb8914

Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
2017-05-12 06:48:04 +00:00
Matthew Fritze
01f5f5d5c9 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
am: b38c1e5353

Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
2017-05-12 06:46:32 +00:00
Chris Wren
aebf049b4f Merge "add a global control for badging" into oc-dev
am: 1425b91bac

Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
2017-05-12 05:57:49 +00:00
jackqdyulei
4b749c2b0a Merge "Add animation for battery asyncLoader." into oc-dev
am: 6c680a36c5

Change-Id: I7a04ed25dd48fdb9f3837f03c93dc4818aaadfde
2017-05-12 04:58:12 +00:00
Doris Ling
93ff2d69f1 Merge "Fix crash when activity not attached after search index finishes." into oc-dev
am: d3e33ebcef

Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
2017-05-12 04:57:40 +00:00
Chris Wren
715f096678 Merge "allow secondary users to use notification settings" into oc-dev
am: 72cc7b7915

Change-Id: I0ea930f20fec81b5f2ada8a74f65c68375de8c55
2017-05-12 04:57:08 +00:00
TreeHugger Robot
b747be0769 Merge changes from topic 'onarevert' into oc-dev
* changes:
  Update "Open networks available" setting.
  Revert "Update "Open networks available" toggle to instead open notification channel preferences."
2017-05-12 04:40:27 +00:00
Sudheer Shanka
8f806c0992 Update FakeUid to include new methods.
Bug: 34133340
Test: builds
Change-Id: I8c17e80002685e8e5e214d6238084584ae15ea30
2017-05-11 20:56:58 -07:00
TreeHugger Robot
b38c1e5353 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev 2017-05-12 02:04:38 +00:00
Chris Wren
1425b91bac Merge "add a global control for badging" into oc-dev 2017-05-12 01:49:07 +00:00
Matthew Fritze
76d9b53048 Remove Special App Access duplicate from Setting search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I7f6a466c0551828c319c2da541fbeb0e428c62f8
2017-05-11 18:37:47 -07:00
TreeHugger Robot
6c680a36c5 Merge "Add animation for battery asyncLoader." into oc-dev 2017-05-12 01:35:23 +00:00
TreeHugger Robot
d3e33ebcef Merge "Fix crash when activity not attached after search index finishes." into oc-dev 2017-05-12 01:31:21 +00:00