Xin Li 45c581df53 [automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours ...

am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224 is already in history

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

Change-Id: I6fc2e4a1c103c7efad592eb468a441795c267e07

2021-12-21 07:20:47 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54

2021-12-14 02:46:04 +00:00

src/com/android/settings

Merge "Settings: Extend the data role swap timeout value" am: bb994f627f am: df2a22f104

2021-12-15 07:23:26 +00:00

tests

Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92

2021-12-20 03:31:28 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Use Lottie animation for traffic light face education

2021-05-24 14:47:19 -07:00

AndroidManifest.xml

Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c am: 095e4093b0

2021-12-10 07:12:54 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update the image for Fingerprint Finish page

2021-06-21 17:20:00 +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

Revert "Update proguard"

2019-02-06 15:44:40 +00: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%