Treehugger Robot 960644dff5 [automerger skipped] Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a am: d558605aeb -s ours am: 9561f091e1 -s ours ...

am skip reason: Change-Id I62c589679052b276927d057d3d5d084bbfb57626 with SHA-1 cacf9aa485 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic021d9c984218c0503bf03cbe9ec3a5024a02f56

2021-02-18 18:06:14 +00:00

libs

Update proto for contextual_card_list.

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

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "Restructure app info page" into sc-dev am: fcdd955dff

2021-02-18 11:20:37 +00:00

src/com/android/settings

Merge "Fix broken tests" into sc-dev

2021-02-18 16:27:10 +00:00

tests

Merge "Fix broken tests" into sc-dev

2021-02-18 16:27:10 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Revert "Export proguard.flags, manifest and sources for use by S..."

2021-01-19 05:23:08 +00:00

AndroidManifest.xml

Merge "Change SIM dialog activity theme" into sc-dev

2021-02-18 09:18:37 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix the issue of the repo upload hooking checker

2021-02-09 21:41:48 +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%