Xin Li e401f808d6 [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours ...

am: f0acd850fb -s ours
am skip reason: subject contains skip directive

Change-Id: I6f942defbfadc4843ec881dd08feaf61db69d3d6

2019-05-09 17:25:01 -07: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 "Update strings used in SAW unsupported screen" into qt-dev

2019-05-09 14:04:47 -07:00

src/com/android/settings

Merge "Display profile picker for content capture settings." into qt-dev

2019-05-09 12:18:40 -07:00

tests

Merge "Fix robolectric test error" into qt-dev

2019-05-09 13:30:16 -07:00

.gitignore

Create gitignore for Settings

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

Android.mk

Add SettingsIntelligenceLogwriter

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

AndroidManifest.xml

Merge changes from topic "Face Intro Changes" into qt-dev

2019-05-08 23:55:22 +00:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Make the selected importance more prominent

2019-05-03 19:31:19 +00: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%