Shuzhen Wang d359d7c47e [automerger skipped] Merge "Settings: Add logical camera default switch" into pi-dev am: 871d93a564 ...

am: 94f80c719a  -s ours

Change-Id: I161d7bbb078320d0dbd43ed08dc13fe5791d8fa8

2018-05-18 18:51:13 -07:00

res

Merge "Update headset, help, and info icons" into pi-dev am: 88d4356a1f

2018-05-18 18:30:26 -07:00

src/com/android/settings

Merge "Don't use cached app icon in app info page." into pi-dev am: 7312f55549

2018-05-18 16:10:25 -07:00

tests

Merge "Don't use cached app icon in app info page." into pi-dev am: 7312f55549

2018-05-18 16:10:25 -07:00

Android.mk

Migrate Settings to androidx.

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

AndroidManifest.xml

Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am: ef088843ae

2018-05-17 12:25:28 -07:00

CleanSpec.mk

CleanSpec!

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

color-check-baseline.xml

Fix color lint baseline. am: 76a0ef6adb

2018-05-18 14:39:57 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%