Bonian Chen ec4e1a14e0 Merge "[Setting] Fix merge conflict" ...

am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8

2019-11-26 02:02:03 -08:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

Merge "Add compatibility change preference"

2019-11-22 06:06:39 -08:00

src/com/android/settings

Merge "[Setting] Fix merge conflict"

2019-11-26 02:02:03 -08:00

tests

Merge "[Setting] Fix merge conflict"

2019-11-26 02:02:03 -08:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Convert Settings to Android.bp

2019-05-13 13:42:01 -07:00

AndroidManifest.xml

Added different flow for re-enrollment

2019-09-26 23:54:59 +00:00

CleanSpec.mk

Move Settings app to /product

2018-12-18 09:51:08 +00:00

color-check-baseline.xml

Updating colors for dark theme

2019-06-06 16:48:29 -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

Update Settings owners

2019-05-02 01:44:42 +00:00

PREUPLOAD.cfg

Add string linter preupload check

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

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +00: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%