app_Settings

Go to file

Automerger Merge Worker d2d55d6c2e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: a6262f4929 -s ours am: 5b1fdf9c97 -s ours" into sc-v2-dev-plus-aosp am: e339aed968 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c406b241a8794dc2cfb73f03d94683bc1ad0131

2021-09-12 14:08:24 +00:00

libs

Update window extension library

2021-09-06 21:24:36 +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-09-11 09:08:17 +00:00

src/com/android/settings

Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf am: a168e2e0fc

2021-09-11 18:25:11 +00:00

tests

Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf am: a168e2e0fc

2021-09-11 18:25:11 +00:00

.gitignore

…

Android.bp

Import the window extension libary in the Settings app

2021-08-19 17:23:11 +08:00

AndroidManifest.xml

Merge "2 panes deep link for large screen devices" into sc-v2-dev am: 93e8dff489 am: 7cc196afc3

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

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update window extension library

2021-09-06 21:24:36 +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-19 17:23:11 +08:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…