Bill Yi 3f3eae8742 [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours am: 573a375a5a -s ours am: 5f20dd4ce2 -s ours ...

am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5678f476c9141a38eb618aa18e23607c27faa46e

2021-02-04 19:44:36 +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

[Provider Model] Internet Panel - Airplane mode is on am: 7a62ab1fff

2021-02-04 15:19:57 +00:00

src/com/android/settings

[Provider Model] Internet Panel - Airplane mode is on

2021-02-04 18:48:34 +08:00

tests

[Provider Model] Internet Panel - Airplane mode is on

2021-02-04 18:48:34 +08: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 "Slot Change Receiver Migration" into sc-dev

2021-02-01 23:57:09 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update homepage notification background color

2021-01-15 20:25:55 +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%