Xin Li d77cc96126 [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours ...

am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: Ie0cf9b959ab83a2cb9a838cfda6ee74375483a78

2022-03-08 11:03:49 +00:00

libs

Sticky placeholder and adjacent finish rule in Settings

2021-11-09 22:32:58 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2

2022-03-07 13:06:22 +00:00

src/com/android/settings

Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 am: 39bc6f906f

2022-03-04 08:41:05 +00:00

tests

Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102

2022-03-02 00:13:00 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge sc-v2-dev-plus-aosp-without-vendor@8084891

2022-02-11 07:29:32 +00:00

AndroidManifest.xml

Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21

2022-03-02 11:59:46 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update background color for two-pane mode

2021-12-01 16:39:09 +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

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08: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%