SongFerng Wang 7877784071 [automerger skipped] Merge "aggregate the items of network selection list" into sc-dev am: 9e6928ae2e am: eb2525603f am: bba3f60330 -s ours ...

am skip reason: Merged-In I8e05b9f6784bad7f0de4e79cc6e707749745f0c1 with SHA-1 2868b4af7a is already in history

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

Change-Id: Idaa254083e15e776d3cae46d6da25bd1d3feca4b

2021-07-23 09:51:47 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge "Add TARE button and homepage to developer options."

2021-07-22 22:21:42 +00:00

src/com/android/settings

Remove some debugging log to avoid print too much data out am: 13bcdba67a am: 31182c6551

2021-07-23 09:08:12 +00:00

tests

Merge "aggregate the items of network selection list"

2021-07-22 19:54:25 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Add WifiTrackerLib as separate dependency from SettingsLib

2021-06-10 14:33:05 -07:00

AndroidManifest.xml

Merge "Add TARE button and homepage to developer options."

2021-07-22 22:21:42 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update the image for Fingerprint Finish page

2021-06-21 17:20:00 +08:00

NOTICE

auto import from //depot/cupcake/@135843

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

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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%