Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
Go back to top of list when Settings is relaunched

Also fixes slight movements when coming back from Add account.

Bug: 7312513
Bug: 7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
merge in jb-mr1-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Merge "Go back to top of list when Settings is relaunched" into jb-mr1-dev
Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev
Fix padding for PagerTabStrip on large screen devices

Bug 7323241

Change-Id: I83cd4d4e1eea150817c519328bb2572b6043b3b7
Use user-specific PackageManager.

Bug: 7095093
Change-Id: Ia97065d4bdf5203372b76b62a6dfd72858892234
Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev
Accessibility enabled by gesture not reflected in settings screen.

1. We have added a global gesture to enable accessibility which is long press
   on power followed by a long press with two fingers. If this gesture is
   performed when the settings for an accessibility service are on the screen,
   accessibility and the screen-reader are enabled while the UI does not reflect
   that and the user may try to enable the already enabled screen-reader which
   will show two irrelevant warning dialogs - one for enabling the screen-reader
   and one for enabling explore by touch (assuming the screen-reader requests it).
   This change adds a simple content observer for the relevant accessibility
   settings which upon a change calls the functions to refresh the settings UI.

bug:7309127

Change-Id: I214c64877086eeb1fe156bcc195aa4e2931d6bdb
merge in jb-mr1-release history after reset to jb-mr1-dev
Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev
Merge "Use user-specific PackageManager." into jb-mr1-dev
Fix issue #7318666: hide developer options from user build

Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
Disable security widgets for now

Change-Id: Ia4627d697514c4029fb0fb3250d674ed25495f97
Import translations. DO NOT MERGE

Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61
Auto-generated-cl: translation import
Move lockscreen to using haptic feedback setting.

This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.

Bug: 7318772
Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev
Switch to IPackageManager.getServiceInfo().

Bug: 7095093
Change-Id: I79b9f077c9d69c5629b7dd0071a11ccda50839cd
Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev