Treehugger Robot b37895268a [automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9ae am: 428e9e636e -s ours ...

am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I406df0fb04ab8e070c78dd8b4c6ed6634b5a3b84

2022-02-08 19:44:40 +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

Import translations. DO NOT MERGE ANYWHERE

2022-01-25 06:29:10 +00:00

src/com/android/settings

Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0

2022-02-08 09:52:04 +00:00

tests

Merge "Removed mocked BluetoothAdapter"

2022-02-07 21:17:41 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

[MS48.2] Remove NetworkStatsHistory from CycleAdaptor

2022-01-27 08:46:05 +00:00

AndroidManifest.xml

Merge "Add QUERY_AUDIO_STATE permission"

2021-12-29 19:26:47 +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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%