Bill Yi 481b51e7f3 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours ...

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

Change-Id: I636c33ea04b552a66024e99e1fa337f4808628d7

2019-09-11 23:04:52 -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

Use TwoTargetPreference to replace customized layout

2019-09-11 13:08:47 +08:00

src/com/android/settings

Merge "Use TwoTargetPreference to replace customized layout"

2019-09-11 08:35:37 +00:00

tests

Merge "Fix testcase error and UI refresh issue"

2019-09-10 00:47:24 +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

Fix upper back button behavior of LocationSettingsActivity

2019-09-05 16:25:17 +08: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

…

NOTICE

…

OWNERS

Change OWNERS

2019-07-12 16:35:12 +08: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%