Xin Li 69e79704e3 [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d43 -s ours ...

am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f9214763 is already in history

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

Change-Id: Ibb132379ab32739f0c9bdc29ded3159775eb884e

2021-11-18 22:00:58 +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

Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e

2021-11-17 14:19:22 +00:00

src/com/android/settings

Merge "Add entry point for adaptive brightness settings" am: d3d24b65ac am: f7836dd7bc am: bd105d62e0

2021-11-09 08:18:41 +00:00

tests

RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5

2021-11-09 07:27:19 +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 "Add entry point for adaptive brightness settings" am: d3d24b65ac am: f7836dd7bc am: bd105d62e0

2021-11-09 08:18:41 +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%