packages-apps-Settings

Fork

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczuIACgkQ6K0/gZqxDnim9wCfU69t/uqtK/g44Tolchk7psO9
Df0An3VmPR/vBg1+fDfzxAt+mPfXyfBr
=acAG
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into marshmallow-x86

Android 6.0.1 release 74

Settings: statusbar: Enable notification icon count by default

This used to be enabled by default in previous releases.

Change-Id: I2eedf7d6a7864e8c27f74493af5227b61f7d8f31

Automatic translation import

Change-Id: I4385697ba782926faa8cfcbdc6267a7f29e2c35b
Ticket: -

Automatic translation import

Change-Id: Ie790fe3f1b922d25f91b4c4f2338e9f8a7d115bf
Ticket: -

Automatic translation import

Change-Id: I82e8903deb0d37f2da11699493f0cdaf2c3f5dde
Ticket: -

Automatic translation import

Change-Id: Ie58e94430b39ee70545b95962155be1d41be4e90
Ticket: -

Automatic translation import

Change-Id: I163776c38e0240ccbe78cb752a87658cec7c9975
Ticket: -

Automatic translation import

Change-Id: Ibfa6607fad1b0f84a126a87abb6c4116a44adc2f
Ticket: -

Automatic translation import

Change-Id: Ie7efb587de11baf48fa9bc581df958fcd04b150a
Ticket: -

Automatic translation import

Change-Id: I8991cabc252267d4db6f08dbfaf5513e218029e0
Ticket: -

Automatic translation import

Change-Id: I6accc5d5e84063b20a7837ccac93dbcd78c67f21
Ticket: -

DataUsageUtils: Clean up based on code review

* Add missing header
* Extract DataUsageContract.UID + " = ? " into a string
* Simplify "0" string
* Use try-with-resource block to ensure cursor is closed

This commit is based on the post-merge feedback of Kamaljeet Maini,
Fabrice Di Meglio and Danny Baumann.

Change-Id: I774948ba119e3e4a2dd438e1ed1588bfb9fefae2

telephony: Disable the SIM state change receiver

We've mistakenly reimplemented this functionality at the telephony
framework because we didn't realize it was here to begin with (and
neutralized by a QC commit).
Having the QC configuration in place makes _both_ come up, which
is annoying...
Since the f/o/t implementation (change
Iddaef47eefeab43ed99ca6f27f81dffd8dd08689) uses different visual
assets people are already used to, let's forcefully use that one
for now until we figure out which one we want to retain...

Change-Id: I1dfab99e475b2d5aa4574ecdb5d0d7ee6cf00191

NotificationLightSettings: Remove noop fields when LED can't pulse

Change-Id: I639b7fc385ffbc551ca3708d9f42db59662b6bee

Settings: Hide Reset action if Battery LED is not multicolor

Change-Id: Icb3c7d640cb540d69efa7186c84a92e4e780968d

Settings: Make proximity wake string more accurate

We also check the proximity sensor for gesture-activated wake-ups,
such as tap to wake.

Change-Id: I4e73a8d9b116e49fa168c1a4a457f55ff3885aea

lights: Use NotificationManager to figure out LED capabilities

As of f/b change I7d627914b058861048071fc15776031c4152157f, there's
a more generic helper method in the notification service to get a
more unified (and extensible) list of what the on-device LEDs can
do. Move away from direct usage of the boolean resources.

Change-Id: Ib9a6f28dc52af722dac168ec219b790ad94d6a19

Settings: Fix mismerge

* This was wrongly added during merge of tag 'android-6.0.1_r74'

Change-Id: I43f10016b69b4680da01be77ecb5fbb7e84a7429

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczuIACgkQ6K0/gZqxDnim9wCfU69t/uqtK/g44Tolchk7psO9
Df0An3VmPR/vBg1+fDfzxAt+mPfXyfBr
=acAG
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into HEAD

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Id902564eaffb5084650acbee5f9b853fba21cc86

SecuritySettings: Fix KeyStore related NPE's

Both "Show password" and "Credential storage" options depend on having
a KeyStore. However, KeyStore assumes that there's an
android.security.keystore service around. Let's validate if it indeed
exists and not show those two sections if it doesn't, in order to
avoid breakage.

Issue: BUGDUMP-7995106

Change-Id: I30b74057aae42e72387087d1c1d847dd8524f87f

Add setup UI for minimum delay between an app's notification sounds.

Change-Id: I70e9cc308b4f7c7681457a0b09dd73e5d1aebb73

Allow selecting vibration mode during zen priority mode.

Change-Id: I4e80e920e4d8f42b0255fd3f528c464b7f094d0e

Settings: Apn: Don't dereference a null mSubscriptionInfo

When switching sims mSubscriptionInfo can be temporarily null, don't
dereference it in those cases. The interface will be updated afterwards
when the subscription status changes.

Change-Id: I1011a10434fad8fd911164217b9fb2d0dfb82b2a
Ticket: CYNGNOS-3291

Settings: display: Fix search indexing of high touch sensitivity

Mark the feature as non-indexable if it is *unsupported*,
not if it is supported.

Change-Id: Ia1388044ec5944e1782f894ed0c6abe4b3e0c9e8

Settings: Update contributors cloud DB

Change-Id: I28f0d64aa19ec46c8819c70174b3633684898e28

Android 6.0.1 Release 72 (M4B30X)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz3TEACgkQ6K0/gZqxDnjfFwCfaYY2Wc22PS029/TgDU3PTXPg
PkAAnRxStD6DtT+4yUfocepEtPvTHRQj
=zo43
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r72' into HEAD

Android 6.0.1 Release 72 (M4B30X)

# gpg: Signature made Tue 04 Oct 2016 09:47:45 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
(cherry picked from commit c94f2b93afa2db9d87f9d8e0dc0c8709f16a326d)