Bonian Chen abd475df36 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours am: 8c81b0f412 -s ours am: 84c6336cff -s ours am: f534811627 -s ours ...

am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: I350f61c610d4f7199d67a3a9659f4563826aeb97

2020-08-05 06:39:48 +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 "Update language to comply with Android's inclusive language guidance" am: 6a68e2f216

2020-08-04 15:56:08 +00:00

src/com/android/settings

Merge "Update language to comply with Android's inclusive language guidance"

2020-08-04 18:52:54 +00:00

tests

Merge "Update language to comply with Android's inclusive language guidance"

2020-08-04 15:40:55 +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-26 15:59:13 +00:00

AndroidManifest.xml

Merge "Revert "Initial setup for slot change receiver migration""

2020-07-21 06:01:24 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix the color-check-baseline checker error while repo upload

2020-07-24 13:25:30 +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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%