Hugh Chen 2b1473002a [automerger skipped] Add condition to check case of accessory combinations am: b767df1a08 am: 416110bac0 -s ours ...

am skip reason: Change-Id I7c80f02de5340799e292949608e19b86b187b982 with SHA-1 7d71081d45 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I033d1b9b5eb516dd781304b2627da1ebe8a8728a

2020-12-15 05:17:39 +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 "Grays out Screen Timeout Setting when disabled."

2020-12-15 02:59:04 +00:00

src/com/android/settings

Merge "Automatically dismiss SIM combination warnings and selection dialogs."

2020-12-15 04:53:44 +00:00

tests

Merge "Automatically dismiss SIM combination warnings and selection dialogs."

2020-12-15 04:53:44 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb am: 25ee8c7cf0

2020-12-14 22:56:14 +00:00

AndroidManifest.xml

[SIM Dialog Migration] Sending push notification after DSDS reboot

2020-11-30 20:47:39 -08:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color lint errors

2020-09-30 16:09:05 +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%