Bill Yi 379ae6c7b8 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours ...

am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I9bffdf82e1739f2d962e3f5b5aa5369a45d0533b

2020-09-19 07:01:22 +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 "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master

2020-09-02 17:50:47 +00:00

src/com/android/settings

Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9

2020-09-12 02:21:21 +00:00

tests

Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 am: ccc406381a

2020-09-15 09:09:28 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Do not exlicitly declare dependency on changeid processor.

2020-03-28 16:30:47 +00:00

AndroidManifest.xml

[DO NOT MERGE] Add toggle for media resumption

2020-06-18 23:58:34 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Workaround for Recent app icon disappear

2020-06-16 17:30:32 +08:00

NOTICE

…

OWNERS

Update the OWNER files

2020-03-11 16:45:14 +08:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +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%