Hunter Knepshield 162b2de3cb [automerger skipped] Merge "Synced the code from master branch" am: 64efbe1240 am: 418ef9973e ...

am: b0b539946f -s ours
am skip reason: change_id I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a with SHA1 0f844d168b is in history

Change-Id: I0d20087a13d99cb95e103093a53fb5ca3cd42768

2019-11-15 11:02:30 -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 "Import translations. DO NOT MERGE"

2019-11-15 18:00:33 +00:00

src/com/android/settings

Merge "Swap param order in registerSoftApCallback"

2019-11-15 18:58:28 +00:00

tests

Merge "Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"

2019-11-15 18:17:33 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Added WifiSettings -> WifiSettings2 redirection behind feature flag

2019-07-22 14:41:11 -07:00

AndroidManifest.xml

Merge "Add NLS specific screens for notification listener approval"

2019-11-13 14:02:39 +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

Change OWNERS

2019-07-12 16:35:12 +08:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +08: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%