Bonian Chen 09071f7a2d [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours am: cce627f7a7 -s ours ...

am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: I90c98f6131f2f5f597c1982a30f10f1c7b4b7f26

2020-08-06 16:36:12 +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 14:33:42 +00:00

src/com/android/settings

Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66

2020-08-06 11:21:50 +00:00

tests

Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: 4a142045aa

2020-07-29 23:26:26 +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

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%