Xin Li d4a9a1e98a [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours am: 32f9c41a53 -s ours am: 6fc837c6e7 -s ours ...

am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I5d420c1da7ec84ad3159ae7fec86c4d5375f21a2

2021-09-29 06:26:49 +00:00

libs

WM Jetpack interface update in Settings

2021-09-22 15:47:33 -07:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Import translations. DO NOT MERGE ANYWHERE

2021-09-28 08:57:21 +00:00

src/com/android/settings

Merge "Invoke close() method for BatteryUsageStats to close cursor window"

2021-09-29 03:27:10 +00:00

tests

Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7

2021-09-27 15:49:47 +00:00

.gitignore

…

Android.bp

[Settings] Enable kotlin language support

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

AndroidManifest.xml

Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b am: 209210b0b6

2021-09-28 04:53:15 +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

…

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-19 17:23:11 +08:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%