TreeHugger Robot 083d5cc2ff [automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: f88ab5986b -s ours ...

am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 fb29dc8a51 is already in history

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

Change-Id: Ic438d4c1b11114640dc76df6e25f66143f71340c

2021-08-23 16:43:14 +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 "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev

2021-08-22 17:45:11 +00:00

src/com/android/settings

Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: a0c8d6d6aa

2021-08-23 16:42:55 +00:00

tests

Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev am: c63c0d4370

2021-08-23 05:45:32 +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 "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: 0050cbc711

2021-08-23 16:42:45 +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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%