Atanas Kirilov e190f40dae Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53 am: 128334d2c6 ...

am: 8006c6a726

Change-Id: I6b7b04980efc8b73b9e974bcfe0dcf8b7a7d437a

2018-06-04 18:51:33 -07:00

res

Merge "Revert "Settings: Add logical camera default switch""

2018-06-04 17:35:57 +00:00

src/com/android/settings

Merge "Suppress work-profile search terms when no AfW is on device"

2018-06-04 23:03:30 +00:00

tests

Merge "Revert "Settings: Add logical camera default switch""

2018-06-04 17:35:57 +00:00

Android.mk

Migrate Settings to androidx.

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

AndroidManifest.xml

Merge "delete DeviceInfoSettings and activity, pref xml"

2018-05-30 20:14:50 +00: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%