app_Settings

Go to file

Automerger Merge Worker f4cccaf268 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev am: 1119508d1c -s ours am: 5d7e59f6ca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I90860edbf0fb4b6a84ccb25b8d60d8bd2cd4e82a

2021-05-16 11:47:54 +00:00

libs

…

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a

2021-05-14 21:26:24 +00:00

src/com/android/settings

Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28

2021-05-14 19:50:34 +00:00

tests

Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28

2021-05-14 19:50:34 +00:00

.gitignore

…

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

AndroidManifest.xml

Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52

2021-05-13 02:43:23 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color check error

2021-05-11 13:21:38 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…