Jonathan Scott 550496d236 [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 skip reason: subject contains skip directive

Change-Id: If66c539a683b4edeeca60140fb6c85eed1902d99

2019-05-08 16:25:48 -07:00

res

Import translations. DO NOT MERGE

2019-04-05 12:44:47 -07:00

src/com/android/settings

Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev

2019-05-08 20:00:27 +00:00

tests

Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94

2019-05-07 21:15:40 -07:00

Android.mk

Updates to match prebuilts drop

2018-04-04 16:08:17 -04:00

AndroidManifest.xml

Move "About Phone" to bottom of Settings main IA, above "Tips & Support"

2018-11-09 11:24:48 +08:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Move "About Phone" to bottom of Settings main IA, above "Tips & Support"

2018-11-09 11:24:48 +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

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Updates to match prebuilts drop

2018-04-04 16:08:17 -04:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

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

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%