TreeHugger Robot 701fe2cfde [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: ab8b39c5e0 -s ours ...

am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

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

Change-Id: I034ac7eeb1557b79fad15ef4a52d8f5d62668997

2022-01-13 20:31:35 +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 "Import translations. DO NOT MERGE ANYWHERE"

2022-01-11 00:46:54 +00:00

src/com/android/settings

Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9

2022-01-13 20:31:28 +00:00

tests

Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9 am: 039cdfd764 am: 5ea82e5955

2022-01-11 10:03:53 +00:00

.gitignore

…

Android.bp

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08:00

AndroidManifest.xml

Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c am: f3f9477f6e am: 3843e5a957

2021-12-29 20:23:02 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update background color for two-pane mode

2021-12-01 16:39:09 +08:00

NOTICE

…

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

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%