Weng Su 7485367374 [automerger skipped] [Provider Model] Pass null to the reason parameter to avoid unnecessary am: 7c041874ce am: 3d7d7456c9 -s ours ...

am skip reason: Merged-In I469a8c72fc7a6ab057acef476296285bb8a62713 with SHA-1 7c041874ce is already in history

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

Change-Id: I65bce623c0a56d268517398c8e87ac67622b2b94

2021-05-29 14:50:02 +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 "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014 am: 28544e66b2 am: 704b9458c0

2021-05-28 04:08:45 +00:00

src/com/android/settings

Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06 am: 7425f30a21 am: 8b201e4d3e

2021-05-28 04:08:57 +00:00

tests

Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537 am: d5f9f645c3 am: f6bd155c98

2021-05-28 04:08: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 "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe am: 286ed10432 am: a4391091b1

2021-05-28 04:09:02 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color check error

2021-05-11 13:21:38 +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%