hughchen 4bf7c3a921 Bluetooth and NFC added back to Connection preferences ...

* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90

2018-05-16 08:03:00 +00:00

res

Bluetooth and NFC added back to Connection preferences

2018-05-16 08:03:00 +00:00

src/com/android/settings

Bluetooth and NFC added back to Connection preferences

2018-05-16 08:03:00 +00:00

tests

Merge "Convert Smart Storage to BasePrefController"

2018-05-16 00:21:51 +00:00

Android.mk

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

AndroidManifest.xml

Update sound setting icons am: 37a6a91444

2018-05-15 19:05:04 -07:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Update color whitelist for check color repohook

2018-04-02 11:32:06 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%