app_Settings

Go to file

Fan Zhang 1277478807 [automerger skipped] [automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444 am: 9366d11e6d am: 657f8713ff am: 1b29c28aef

am: 0ee2857d0a -s ours
am skip reason: change_id I4be265565678302fad207839216d5cd65dcb6e94 with SHA1 9d46e1fdfe is in history

Change-Id: Ie84c7488db95a1693b8f6bf3ceaf7033dc3acc75

2019-03-09 08:36:41 -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 "Support VPN Proxy(2/2)" am: 2a695c4b7b am: e2f74af063

2019-03-09 04:20:32 -08:00

src/com/android/settings

Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b am: e2f74af063

2019-03-09 04:20:32 -08:00

tests

Merge "Use RoleControllerService for role related APIs."

2019-03-08 21:51:25 +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 "Implemented Settings.ACTION_REQUEST_ENABLE_CONTENT_CAPTURE"

2019-03-09 04:16:41 +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