Raff Tsai 93aed56281 [automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours ...

am: 8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7

2019-05-29 18:33:23 -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 "Change title to "Alerting"" into qt-dev

2019-05-29 19:19:59 +00:00

src/com/android/settings

Merge "Switch to using an intent for eSIM erasing" into qt-dev

2019-05-29 20:02:48 +00:00

tests

Merge "Switch to using an intent for eSIM erasing" into qt-dev

2019-05-29 20:02:48 +00: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

Switch to using an intent for eSIM erasing

2019-05-28 15:31:51 -07:00

CleanSpec.mk

Move Settings app to /product

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

color-check-baseline.xml

Revert "Revert "Make subsettings display edge-to-edge""

2019-05-14 13:48:12 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

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%