Commit Graph

35568 Commits

Author SHA1 Message Date
Fan Zhang
30dd978830 Merge "Fix action bar background not wide enough on tablets" into oc-dev
am: 8cd4b4541d

Change-Id: I226818d439c7351331ff356e4bc25906a6601b9f
2017-04-19 19:39:03 +00:00
Fan Zhang
3acabbdee9 Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
am: 4967646661

Change-Id: I6548247f2eb2f4946fd51e109bccfb0ea3bfcfb9
2017-04-19 19:38:30 +00:00
TreeHugger Robot
8cd4b4541d Merge "Fix action bar background not wide enough on tablets" into oc-dev 2017-04-19 19:36:25 +00:00
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
Matthew Fritze
0c8fe31184 Revert "Listen to brigtness updates to update brightness summary."
This reverts commit 4b95879634.

Change-Id: I09fd9c843a4d32a131b87cd638785af552f81507
Test: None - revert
2017-04-19 11:24:26 -07:00
TreeHugger Robot
2ee8ed23ca Merge "Only show headers in Master Clear when there are multiple profiles" 2017-04-19 18:17:00 +00: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
e9edc8f357 Merge "Respect user's choice on a11y shortcut dialog" into oc-dev am: d4ce883c64
am: 8a3d606a60

Change-Id: Id39f650645400b4e5076ea0a9cd86925244e76d5
2017-04-19 16:16:14 +00:00
Phil Weaver
8a3d606a60 Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
am: d4ce883c64

Change-Id: I82abeb908dee28948443c05adadc96ba2ca2bea6
2017-04-19 16:14:47 +00:00
Phil Weaver
d4ce883c64 Merge "Respect user's choice on a11y shortcut dialog" into oc-dev 2017-04-19 16:09:16 +00:00
Bartosz Fabianowski
30ba868014 Only show headers in Master Clear when there are multiple profiles
The Master Clear dialog lists the accounts whose data will be lost by
a factory reset. The list contains the headings "Personal" and "Work"
to distinguish accounts in the main user and the work profile. When
there is no work profile, the header (only "Personal" would be shown in
this case) is superfluous and misleading (as the user may be using the
device for work).

Bug: 30132270
Test: Manual :(

Change-Id: Id493652fc331d4500c4d772a9abcc716995565b3
2017-04-19 11:57:04 +02:00
Kevin Chyn
9c93ad44a4 Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev am: eb62407114
am: 98a7794b13

Change-Id: I11f9e5996109f7f5698c389f3a1b0cac63cf2ef6
2017-04-19 08:15:20 +00:00
Kevin Chyn
98a7794b13 Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
am: eb62407114

Change-Id: I720cf3554c54cedfb674e93c552f45ab368734a9
2017-04-19 08:13:20 +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
Sunny Goyal
91f6cad742 Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8
am: 77fca989a0

Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2
2017-04-19 03:03:50 +00:00
Sunny Goyal
77fca989a0 Merge "Using a common class for loading drawables and handling various badging" into oc-dev
am: d2561263a8

Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96
2017-04-19 02:53:17 +00: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
Sundeep Ghuman
a300f3c53a Merge "Remove animations in WifiSettings." into oc-dev am: 36a3579c61
am: 56de2b521a

Change-Id: I17c5421fc80d5a888355d5e1f69f30cea09dc0fd
2017-04-19 02:24:29 +00:00
Sundeep Ghuman
56de2b521a Merge "Remove animations in WifiSettings." into oc-dev
am: 36a3579c61

Change-Id: I9c0a79d1caed78275e728fc454a97b4124f1da1e
2017-04-19 02:22:28 +00:00
TreeHugger Robot
36a3579c61 Merge "Remove animations in WifiSettings." into oc-dev 2017-04-19 02:17:33 +00:00
Fan Zhang
8adcd2f441 Merge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336
am: 2bb10c9e57

Change-Id: I9d58c7ee1154c640e570627477e97ffaeb68777f
2017-04-19 01:54:40 +00:00
Fan Zhang
2bb10c9e57 Merge "Add test to verify regulatory info launches properly" into oc-dev
am: 4766183336

Change-Id: Idac77bcc7377dd55169f817d39eea52fc757f135
2017-04-19 01:52:26 +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
Sundeep Ghuman
bd1b217da7 Merge "IPv6 addresses should not be selectable." into oc-dev am: 4ae52fc7f0
am: 1e04aa912e

Change-Id: I18c6a34b45138e348cb67cc2500cdf662d712784
2017-04-19 01:11:46 +00:00
Sundeep Ghuman
1e04aa912e Merge "IPv6 addresses should not be selectable." into oc-dev
am: 4ae52fc7f0

Change-Id: Ia5943ec8c4c1630ea35b99c1057c0b50cde1d581
2017-04-19 01:05:34 +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
Saige McVea
c83b8de6a7 Merge "Conditionally reposition experimental preferences." into oc-dev am: b18e31bc5a
am: f869788eb8

Change-Id: I6346767b427cd4d3711251b841afa62863db8bfe
2017-04-18 22:00:48 +00:00
Doris Ling
0ba2b618dd Merge "Listen to brigtness updates to update brightness summary." into oc-dev am: a88635f5a3
am: 96840d4010  -s ours

Change-Id: I1511f985e8e06a1496a1070404808b59ac14d4a4
2017-04-18 22:00:34 +00: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
f869788eb8 Merge "Conditionally reposition experimental preferences." into oc-dev
am: b18e31bc5a

Change-Id: I072311948f0ff2abac3569330ae678da5b5d5ce0
2017-04-18 21:54:38 +00:00
Doris Ling
96840d4010 Merge "Listen to brigtness updates to update brightness summary." into oc-dev
am: a88635f5a3

Change-Id: Ida6ea12152be71e3319479ea73116c68082652b1
2017-04-18 21:54:23 +00: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
7622c300bd Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev am: cf172040a9
am: 2d8a676b47

Change-Id: I25d7f8ad2a4acca731aa29b9a97bb64feb8e3a98
2017-04-18 20:54:59 +00:00
Alison Cichowlas
2d8a676b47 Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
am: cf172040a9

Change-Id: I590ad5b3f2ef6fd5b578e9bdc37d1999d3091a77
2017-04-18 20:49:52 +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
50d359aa38 Merge "Update Setup Wizard Vision Settings colors." into oc-dev am: 221f9245d6
am: 86d10d65ab

Change-Id: I2e1a87c187bf9182b028402ae01d3504e5a637de
2017-04-18 19:48:03 +00:00
TreeHugger Robot
eb9e5be803 Merge "Listen to brigtness updates to update brightness summary." 2017-04-18 19:47:36 +00:00