app_Settings

Go to file

Brad Ebinger 7099f1ce20 [automerger skipped] Merge "Do not show Provisioning items for IMS if it is not enabled." am: be10b45fe6 am: 76b4661f56

am: 6ed6eeb05f -s ours
am skip reason: change_id I9624535fe766cd79eadb30502c1a0574650a02ef with SHA1 5dfe7f8af9 is in history

Change-Id: Ie9996ba6c93a195053c430aeb4bad88bd314b1f2

2019-03-18 14:01:17 -07: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 "Fix voice access issue on home page"

2019-03-18 19:59:27 +00:00

src/com/android/settings

Merge "Force LSKF in ConfirmCredential UI when pending escrow token exists"

2019-03-18 19:44:47 +00:00

tests

Merge "Add null check for worker"

2019-03-18 18:01:08 +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

Base implementation of WFC disclaimer UI

2019-03-14 14:58:20 -07:00

CleanSpec.mk

Move Settings app to /product

2018-12-18 09:51:08 +00:00

color-check-baseline.xml

Fix color lint check error

2019-03-18 11:43:28 +08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

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

…