Xin Li 90645fb925 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours ...

am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-05-04 20:56:53 +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 "Titlecasing time zone summary" am: 1d6e9cfdf2

2022-05-03 13:32:43 +00:00

src/com/android/settings

Merge "Capitalize TZ display name strings" am: 6a44151bc1

2022-05-03 19:27:41 +00:00

tests

Merge "Titlecasing time zone summary" am: 1d6e9cfdf2

2022-05-03 13:32:43 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge sc-v2-dev-plus-aosp-without-vendor@8084891

2022-02-11 07:29:32 +00:00

AndroidManifest.xml

[MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69

2022-03-27 15:26:37 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Remove CryptKeeper

2022-03-08 17:13:22 +00: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%