Treehugger Robot a38e83e80a [automerger skipped] Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 am: ff1ebb31d4 am: afa860da18 -s ours ...

am skip reason: Merged-In I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8 with SHA-1 fa0aec49e3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: Ib67c1dad9fbe0ca14506c19bc1c2d0b8e3f45074

2021-11-29 03:19:23 +00:00

libs

Sticky placeholder and adjacent finish rule in Settings

2021-11-09 22:32:58 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge "[Settings] Move display of VPN version into summary text"

2021-11-26 05:44:35 +00:00

src/com/android/settings

Merge "Fix usage of the updated CDM APIs"

2021-11-26 06:38:03 +00:00

tests

Merge "Fix usage of the updated CDM APIs"

2021-11-26 06:38:03 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

[Settings] Enable kotlin language support

2021-09-23 12:51:26 +08:00

AndroidManifest.xml

Merge "Typo fix in media settings title variable"

2021-11-26 05:44:02 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Update window extension library

2021-09-06 21:24:36 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00:00

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00: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%