app_Settings

Go to file

Automerger Merge Worker a4af82718c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours" into sc-v2-dev-plus-aosp am: 70b22b2b94 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9f03033a230035446845b895597ca1871b29ec47

2021-07-07 18:15:44 +00:00

libs

…

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 8b8ddb89e6

2021-07-07 11:55:55 +00:00

src/com/android/settings

Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e28bdeaf85

2021-07-07 17:14:17 +00:00

tests

Merge "[Settings] Settings within each SIM not been displayed to the user"

2021-07-07 09:03:45 +00:00

.gitignore

…

Android.bp

Add WifiTrackerLib as separate dependency from SettingsLib

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

AndroidManifest.xml

Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433 am: 86928d4f6a

2021-07-06 08:09:20 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update the image for Fingerprint Finish page

2021-06-21 17:20:00 +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

…

TEST_MAPPING

…

wrap_alpha.py

…