Commit Graph

16575 Commits

Author SHA1 Message Date
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
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
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
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
TreeHugger Robot
d6aa9f3454 Merge "Remove Special App Access duplicate from Setting search" into oc-dev 2017-05-16 22:37:22 +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
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
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
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
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
Matthew Fritze
4d9a1ae9a2 Remove default app duplicates in search
Default Work Browser and Phone app search results look
identical to the regular defaults. Supress the results
until we differentiate work results.

"Assist and voice input" duplicate is a parent-child
duplication and is removed, as well.

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: I3bb75c199cd76e24de42548dd166c4bccd0c7f0a
2017-05-11 18:01:49 -07:00
Fan Zhang
6359a19c6f Add a no-op activity to handle development setting intent.
This no-op activity is only enabled when the real setting is
turned off.

Change-Id: I7ccf4645054a60569a77076c24cf42da80479fed
Fix: 37651414
Test: rerun CTS test android.systemintents.cts.TestSystemIntents#testSystemIntents
2017-05-11 23:41:29 +00:00
jackqdyulei
a3c528f64d Add animation for battery asyncLoader.
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.

Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 15:27:23 -07:00
Chris Wren
72cc7b7915 Merge "allow secondary users to use notification settings" into oc-dev 2017-05-11 21:31:46 +00:00
Chris Wren
485e75e063 add a global control for badging
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04:00
Matthew Fritze
03dfa50996 Replace dynamic summary text for SettingPref
All SettingPrefs that have dynamic summaries are replaced
by placeholder text. Changes are for:
- Battery Saver "Turn on automatically"
- Notification "Dock speaker plays"
- Notification "Emergency tone"

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: Ic2556055c155989015dbef6b507d3e3b45b779b5
2017-05-11 12:11:05 -07:00