Android Build Merger (Role) f376fc4ecc Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am: 290b4e507c -s ours am: 723fb8dc91 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp

2019-06-05 09:41:00 +00: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 "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d

2019-06-04 07:43:00 -07:00

src/com/android/settings

Move vibration preview invokation to the correct place am: f8eb8c3c90

2019-06-04 18:51:10 -07:00

tests

Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d

2019-06-04 07:43:00 -07:00

.gitignore

Create gitignore for Settings

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

Android.bp

Convert Settings to Android.bp

2019-05-29 14:45:30 -07:00

AndroidManifest.xml

Reorder notification settings

2019-05-30 16:52:08 -04: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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%