Xin Li dc818b7b1f [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -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: I8efcd178648ac15b8a32e75f7481c5943af94af4

2021-09-29 05:38:41 +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 RQ3A.210905.001 to aosp-master - DO NOT MERGE

2021-09-08 17:57:10 -07:00

src/com/android/settings

Merge "[Settings] backport missing CL" am: a8ee80e95a am: 15c0678ca8

2021-09-24 10:40:36 +00:00

tests

Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55

2021-09-09 10:46:10 +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

Fix launch flags for channel panel

2021-08-09 00:55:39 +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

…

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%