Commit Graph

34931 Commits

Author SHA1 Message Date
TreeHugger Robot
4967646661 Merge "Use AfW user handle when setting auto_sync for work" into oc-dev 2017-04-19 19:32:55 +00:00
Charles He
991ccc26d8 Prevent fingerprint from bypassing work challenge
After too many incorrect attempts at entering the user credential (PIN,
password, or pattern) for the work profile, a timeout will be triggered
to limit the rate of retries. At the same time, fingerprint should no
longer be allowed to unlock the work profile, until the user unlocks it
with the correct user credential.

Previously, fingerprint was not banned from unlocking the work profile
during and after the said timeout. (Pattern lock screen only had a
partial fix which removed the fingerprint UI, but still allowed
fingerprint to unlock.)

This CL fixes the issue. It also replaces the following fields with
equivalent getter methods:
 - mIsStrongAuthRequired,
 - mAllowFpAuthentication.
Otherwise, we would have to rely on these internal states being always
up-to-date, which is less maintainable.

Test: make SettingsGoogle and manually enter incorrect PINs/patterns
Bug: 36912481
Change-Id: Id6ac6b5c78bdc19078ce8dd7acb4ec41329e57c3
2017-04-19 19:58:49 +01:00
Daniel Nishi
0cd1f73b21 Change how we calculate system size.
As per storage discussions, the best way to calculate storage for the
System is to just take all known data and subtract it from the used
bytes. There is more to the system than just the /system partition and,
even if we ignore the partitions and use the underlying block device
method of calculating it, we run into the problem of it not adding up to
the actual device size.

Change-Id: I6e1f775ea3f3b8b2cc78d734623934651e2fb7b4
Fixes: 37166310
Test: Robotests
2017-04-19 11:42:34 -07:00
Phil Weaver
a989b19646 Fix default for a11y shortcut setting
Settings thought the default for "Allow from lock screen" was
on. It's really off.

Bug: 37158451
Test: Manually confirmed that a fresh device now shows off.
Change-Id: I38dc4f6d2bfec5e0c8562c0d2c6e034db461aa98
2017-04-19 11:09:23 -07:00
Fan Zhang
fbb2331ee5 Use AfW user handle when setting auto_sync for work
Change-Id: Ib1aa576a0083282dc59d8fe0d5c4784233eef024
Fix: 36675513
Test: make RunSettingsRoboTests
2017-04-19 10:09:11 -07:00
Phil Weaver
d4ce883c64 Merge "Respect user's choice on a11y shortcut dialog" into oc-dev 2017-04-19 16:09:16 +00:00
TreeHugger Robot
eb62407114 Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev 2017-04-19 08:07:54 +00:00
Sundeep Ghuman
1c231d32b1 Force update APs when enabling wifi in WifiSettings.
Bug: b/37324736
Test: See bug for repro steps.
Change-Id: I2a789e13781c64d2cc72b059685c5f3dfb9ff2ad
2017-04-18 20:28:50 -07:00
TreeHugger Robot
d2561263a8 Merge "Using a common class for loading drawables and handling various badging" into oc-dev 2017-04-19 02:43:48 +00:00
TreeHugger Robot
36a3579c61 Merge "Remove animations in WifiSettings." into oc-dev 2017-04-19 02:17:33 +00:00
TreeHugger Robot
4766183336 Merge "Add test to verify regulatory info launches properly" into oc-dev 2017-04-19 01:48:40 +00:00
TreeHugger Robot
4ae52fc7f0 Merge "IPv6 addresses should not be selectable." into oc-dev 2017-04-19 00:54:33 +00:00
Phil Weaver
ed69e8a417 Respect user's choice on a11y shortcut dialog
Wasn't checking if the user actually agreed. Whoops.

Bug: 37123004
Test: Manually verified that canceling leaves the selection
unchanged.

Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
2017-04-18 17:53:14 -07:00
Sundeep Ghuman
bb46d23c8f Remove animations in WifiSettings.
This addresses jank issues when first showing the WifiSettings. Given
the new loading bar, animated transitions seem less relevant. Based on
user feedback, animations may be readded after a delay in ODR.

Bug: b/37429702
Test: Visual
Change-Id: I9a44820bb354885d0ef31d50278aee6a47727701
2017-04-18 16:45:04 -07:00
Adrian Roos
f33fec4f90 Revert "Changed the ambient display setting name"
This reverts commit 8d164e659d.
Fixes: 36516811
Test: Settings > Display > More, observe that it says "Ambient Display" there again.
Change-Id: I2831bc89e430d08f875c05a1441e1b0556df97e5
2017-04-18 16:26:00 -07:00
Sundeep Ghuman
6347e1b4b8 IPv6 addresses should not be selectable.
Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.

Bug: b/37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
2017-04-18 15:05:17 -07:00
Daniel Nishi
6b37d6341f Gracefully handle null volumes after forgetting.
If a user tells a device to forget a storage volume and then
goes back to the PrivateVolumeForget activity from their Recents, it
attempts to re-initialize itself with a volume that it forgot.

And this makes Settings crash.

By gracefully killing the activity when we try to open
PrivateVolumeForget for a forgotten volume, we avoid this crash.

Change-Id: Ib4e881c10f0c872ce6b268b16a573960230ef99b
Fixes: 34856304
Test: Settings unit test
2017-04-18 14:59:20 -07:00
Saige McVea
b18e31bc5a Merge "Conditionally reposition experimental preferences." into oc-dev 2017-04-18 21:47:25 +00:00
TreeHugger Robot
a88635f5a3 Merge "Listen to brigtness updates to update brightness summary." into oc-dev 2017-04-18 21:47:05 +00:00
Fan Zhang
a006c6de81 Fix action bar background not wide enough on tablets
Change-Id: I82e444dc913429c77c768afada24e10c12c79160
Fix: 37475599
Test: make RunSettingsRoboTests
2017-04-18 14:40:25 -07:00
Sunny Goyal
3b172d7b89 Using a common class for loading drawables and handling various badging
Test: make RunSettingsRoboTests -j31
Bug: 36591157

Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
2017-04-18 21:34:13 +00:00
Alison Cichowlas
cf172040a9 Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev 2017-04-18 20:36:54 +00:00
Doris Ling
4b95879634 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-18 20:01:16 +00:00
Fan Zhang
06ee0e932f Add test to verify regulatory info launches properly
Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix: 34370866
2017-04-18 12:53:24 -07:00
Anna Galusza
221f9245d6 Merge "Update Setup Wizard Vision Settings colors." into oc-dev 2017-04-18 19:35:06 +00:00
Daniel Nishi
edafa44c7e Don't crash on opening ejecting USB.
This crash occurs because, even if you finish an Activity during
onCreate, the other lifecycle methods occur. In this case,
onActivityCreated assumes that onCreate ran properly.

By exiting early from onActivityCreated, we can ensure the activity
is finished properly.

Change-Id: Ia354341bf82d295c7dd042668fb11d588ddfebc0
Fixes: 37334861
Test: Instrumentation test
2017-04-18 12:19:36 -07:00
Alison Cichowlas
7f431e3cd1 In apps with no channels, provide settings for misc channel in top level.
Test: robolectric tests pass, plus manual verification
Bug: 36561295

Change-Id: I58872a41fab562787d85bade0552c7735d716e5b
2017-04-18 18:49:24 +00:00
Matthew Fritze
4fa0a617ec Merge "Revert "Add summary to special app access."" into oc-dev 2017-04-18 17:39:13 +00:00
Matthew Fritze
13e5af06b8 Revert "Add summary to special app access."
This reverts commit 0e1b53fa6f.

Change-Id: Ica5a9f7f40be3a4c2ae0e999d9832717dc44f3b5
2017-04-18 17:35:07 +00:00
TreeHugger Robot
526185c89b Merge "Channel settings updates" into oc-dev 2017-04-18 15:03:55 +00:00
TreeHugger Robot
55a3944dbf Merge "Hide User category if only one user in device" into oc-dev 2017-04-18 03:21:55 +00:00
jackqdyulei
47006d7794 Include type service as type system
Bug: 37293081
Test: RunSettingsRoboTests
Change-Id: Id9259a1a516fdf368d41f1b7205a1515d0989aab
2017-04-17 18:05:05 -07:00
jackqdyulei
cdba2e7266 Hide User category if only one user in device
Fix: 37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d
2017-04-17 17:58:38 -07:00
Lei Yu
89bc5b2bff Merge "Don't show Screen as Apps in advanced battery page" into oc-dev 2017-04-18 00:56:11 +00:00
Maurice Lam
667d694220 Sticky footer for GLIF theme
For settings screens using GLIF theme, update to sticky footers.

Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
(cherry picked from commit a857c8da4f)
2017-04-18 00:33:44 +00:00
TreeHugger Robot
b6a0360a92 Merge "Use buttons for EncryptionInterstitial" into oc-dev 2017-04-18 00:32:55 +00:00
Casey Burkhardt
65523b9cb0 Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev 2017-04-18 00:06:53 +00:00
TreeHugger Robot
6adf04c741 Merge "Consolidate notification settings." into oc-dev 2017-04-17 23:16:38 +00:00
TreeHugger Robot
ceedf2b9bf Merge "Fix startup jank in the Wifi Picker." into oc-dev 2017-04-17 22:47:29 +00:00
Maurice Lam
88df6f4407 Use buttons for EncryptionInterstitial
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb)
2017-04-17 15:42:21 -07:00
Jeff Sharkey
e398a84199 Merge "Follow storage API polishing." into oc-dev 2017-04-17 22:26:44 +00:00
Daniel Nishi
427f976ff4 Merge "Update the old Storage view to look better." into oc-dev 2017-04-17 22:26:11 +00:00
Daniel Nishi
4f2f6bcad9 Merge "Fix a bug where options menu was not showing." into oc-dev 2017-04-17 22:25:53 +00:00
TreeHugger Robot
3a156f5509 Merge "Make battery status refresh in SettingsActivity" into oc-dev 2017-04-17 21:53:56 +00:00
Julia Reynolds
8cf8bf0ae8 Consolidate notification settings.
App notifications now appears under configure notifications.

Bug: 36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86
2017-04-17 21:28:47 +00:00
TreeHugger Robot
8e1d588cdf Merge "Use standard preference layout for wallpaper picker" into oc-dev 2017-04-17 21:10:31 +00:00
Sundeep Ghuman
60c1d4ec64 Fix startup jank in the Wifi Picker.
Synchronously fetch the latest APs during onResume and show these before
displaying the other wifi preferences. This fixes a visibile shuffling
issue. Additional Setting preferences are now programatically added
during onStart and hidden during onStop in order to avoid the animation
delay which causes a shuffling effect.

Bug: b/36406983
Test: Visual inspection. Animation jank is difficult to programatically
test.

Change-Id: I34b2d737a8e72e1dc296c170f753975fafce7a3e
2017-04-17 13:36:35 -07:00
Jeff Sharkey
b80f1ddaf0 Follow storage API polishing.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
2017-04-17 14:29:15 -06:00
Sarah Fortune
f7896f491a Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev 2017-04-17 20:07:32 +00:00
TreeHugger Robot
3265c25861 Merge "Disable SetupRedactionInterstitial when complete" into oc-dev 2017-04-17 19:43:14 +00:00