Alexander Dorokhine 7d952e6ad1 [automerger skipped] Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 am: 1b69ab26e9 am: 94fa8e0921 am: 01236ed32f -s ours am: 0488650aa0 -s ours ...

am skip reason: Change-Id I76f9c37cb699ce6ab8715ffe35d11668ccbceea1 with SHA-1 46e85a2fad is in history

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

Change-Id: I8c5e459eadfefe9deaceba3f3af9357d1dcbfe33

2020-10-06 12:36:07 +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-10-04 23:06:29 +00:00

src/com/android/settings

Merge "Move isMediaOutputDisabled() from Utils to LocalMediaManager"

2020-10-06 08:40:15 +00:00

tests

Merge "Move isMediaOutputDisabled() from Utils to LocalMediaManager"

2020-10-06 08:40:15 +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

[Settings] Refractor ApnSettings code to independent package folder.

2020-09-30 15:56:01 +00: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

Update owner list

2020-09-24 10:18:08 +00: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%