app_Settings

Go to file

Automerger Merge Worker b7daeb661d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours" into sc-v2-dev-plus-aosp am: c73177f8d2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I79cea14d1339a9ace856c3de36c348bddbc87697

2021-07-30 14:48:16 +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

2021-07-30 12:02:35 +00:00

src/com/android/settings

Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164 am: bd71ddc59b

2021-07-30 03:15:07 +00:00

tests

Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0 am: 8a1461a212

2021-07-29 20:15:42 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Add WifiTrackerLib as separate dependency from SettingsLib

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

AndroidManifest.xml

[Provider Model] Correct the Settings shortcut of the Settings Widget

2021-07-26 16:33:31 +08: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

…

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

…