packages_apps_Settings

Go to file

Jonathan Scott 89ccd188e0 [automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 am: 306ff7e3a9 -s ours am: 550496d236 -s ours am: 416b49569a

am: 8402c8c44c -s ours
am skip reason: subject contains skip directive

Change-Id: I27a7c3f01ae5ed2b5c1ef05b14b295a647bab7a2

2019-05-08 18:23:08 -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 changes from topic "Face Intro Changes" into qt-dev am: 0f65b773be

2019-05-08 18:17:00 -07:00

src/com/android/settings

Merge changes from topic "Face Intro Changes" into qt-dev am: 0f65b773be

2019-05-08 18:17:00 -07:00

tests

Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev am: cbd925bf73

2019-05-08 15:14:40 -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 am: 0f65b773be

2019-05-08 18:17:00 -07: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