Bonian Chen ae06d6400f [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours am: 522841a340 -s ours am: 841239c310 -s ours am: c6f6da1353 -s ours ...

am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: Iac25b7e4206f364581326f3a1526f5958518e78d

2020-08-05 07:35:41 +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

Import translations. DO NOT MERGE ANYWHERE

2020-08-05 02:14:15 +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

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%