Commit Graph

35540 Commits

Author SHA1 Message Date
Matthew Fritze
af89d062b4 Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
am: 552fc2922a

Change-Id: I535dbb31e1951869220b50b4f822c068f9cea0f3
2017-04-19 22:36:11 +00:00
TreeHugger Robot
552fc2922a Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev 2017-04-19 22:29:25 +00:00
Sundeep Ghuman
5ac900b5da Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 8025906b7c
am: 05f252ec53

Change-Id: I77d68fe604e84e16aa545b119be96241b855abf6
2017-04-19 22:14:15 +00:00
Fan Zhang
41b5a55175 Merge "Fix malformatted preference xml." into oc-dev am: 569a93b8bb
am: 0a9fddd631

Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166
2017-04-19 22:13:53 +00:00
Adrian Roos
478dcb35d6 Merge "Revert "Changed the ambient display setting name"" into oc-dev am: 97d3709b25
am: 1b322f6283

Change-Id: Ia33ee063b87d2cc6951d6a85a88b45b14c67b229
2017-04-19 22:13:21 +00:00
Matthew Fritze
359bce4f50 Prevent search crashes from uninstalled apps
All search results are now refreshed when resuming the
search fragment, to prevent crashes from results that
no longer exist.

Bug: 34817357
Test: make RunSettingsRoboTests
Change-Id: I96a0cbfee711ab9dee49d56bfdc4e885202d9ecd
2017-04-19 15:06:39 -07:00
Sundeep Ghuman
05f252ec53 Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
am: 8025906b7c

Change-Id: Icfe7abd987ad1f4b6a0475904759cc87eb61a00a
2017-04-19 21:54:21 +00:00
Fan Zhang
0a9fddd631 Merge "Fix malformatted preference xml." into oc-dev
am: 569a93b8bb

Change-Id: Ida4d8631bf7f36d68c9022b9ff72cd2ef3cd4995
2017-04-19 21:54:01 +00:00
Adrian Roos
1b322f6283 Merge "Revert "Changed the ambient display setting name"" into oc-dev
am: 97d3709b25

Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191
2017-04-19 21:53:40 +00:00
TreeHugger Robot
8025906b7c Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev 2017-04-19 21:48:19 +00:00
TreeHugger Robot
569a93b8bb Merge "Fix malformatted preference xml." into oc-dev 2017-04-19 21:42:36 +00:00
Matthew Fritze
c6f2638009 Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
2017-04-19 14:34:13 -07:00
Fan Zhang
8648c5ed3d Display and parse numbers properly in all locales
Change-Id: Iddf74fd6ed3139eede27733b69a31ce2fa7d1a92
Fix: 37311645
Test: make RunSettingsRoboTests
2017-04-19 14:30:19 -07:00
Sundeep Ghuman
b3b0250be8 Fix scanning settings link clickability in Talkback mode.
Bug: b/37431709
Test: make RunSettingsRoboTests
Change-Id: I0dc0a524a3c4abd1743748ebc8ebf20937018047
2017-04-19 14:29:11 -07:00
Daniel Nishi
fa3766a220 Don't show warning dialog on opening ASM settings.
On older devices, the activation warning dialog would show upon the
switchbar changing to On. This was occurring when the page opens
because the status was changing onResume. By shuffling the switchbar
changes into the ASMSwitchBarController, we can register our listener
after the initialization of the switch bar's first status.

Change-Id: I3610d07345684d1e66444981a8059d1c2965e955
Fixes: 37472724
Test: Settings robotests
2017-04-19 14:04:50 -07:00
Adrian Roos
97d3709b25 Merge "Revert "Changed the ambient display setting name"" into oc-dev 2017-04-19 20:50:33 +00:00
Matthew Fritze
0811fd544b Revert "Listen to brigtness updates to update brightness summary."
This reverts commit 4b95879634.

Change-Id: I13de29b0e42a09f6b3618826d7eb2a9ed00a54d8
Merged-In: I09fd9c843a4d32a131b87cd638785af552f81507
2017-04-19 20:35:36 +00:00
Andrew Scull
c23357e9af Use the new OemLockService to get OEM lock state.
Previously, the PersistentDataBlockService but that is only one possible
implementation of the OEM lock. The new service abstracts the
implementation so is the API that should be used.

Test: Manual
Bug: 34766843
Change-Id: I5f9cb94996f84c4c082d152f05cd8aef566edc66
2017-04-19 21:33:37 +01:00
TreeHugger Robot
db654c88bc Merge "Revert "Listen to brigtness updates to update brightness summary."" 2017-04-19 20:22:12 +00:00
Fan Zhang
8a7d60d1ff Merge "Fix action bar background not wide enough on tablets" into oc-dev am: 8cd4b4541d
am: 30dd978830

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

Change-Id: If82d3bcee39eb0c14f1ffb05cb20051d341e2cba
2017-04-19 19:45:30 +00:00
Fan Zhang
a6006285b4 Fix malformatted preference xml.
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix: 37343765
Test: instrumentation test
2017-04-19 12:41:26 -07:00
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