app_Settings

Go to file

Brad Ebinger 70963e3808 [automerger skipped] Merge "WFC roaming mode setting can not be used with a fixed value" am: 7296b6cb1c am: 3c65dc51f3

am: c1bdc0d512 -s ours
am skip reason: change_id Ib2363c5d50f5231cc89f287d760ca8728b02b249 with SHA1 994d27a2a5 is in history

Change-Id: I488660be8a513d82ea04c2e89ca0ad5b67859ecf

2019-03-08 06:56:04 -08:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

Remove deprecated EXCLUSIVE field from proto

2019-02-18 16:25:23 +08:00

res

Merge "Animate the expansion/collapse of a slice"

2019-03-08 09:08:02 +00:00

src/com/android/settings

Merge "Do not allow draw on top for App notification settings"

2019-03-08 13:52:18 +00:00

tests

Merge "Do not allow draw on top for App notification settings"

2019-03-08 13:52:18 +00:00

Android.mk

Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" am: 50a39ba9a9 am: c307426ebe

2019-03-01 18:27:45 -08:00

AndroidManifest.xml

Merge changes from topic "add_cast_volume"

2019-03-06 23:59:44 +00:00

CleanSpec.mk

Move Settings app to /product

2019-01-11 16:41:54 +00:00

color-check-baseline.xml

Remove all reference to settings_side_margin.

2019-02-21 10:18:00 -08: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 owners

2018-12-19 20:24:23 -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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00