app_Settings

Go to file

Xin Li 9239e60fb8 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours am: ff21be103b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0159e5ea1a76a670b67041608bcd8d90c7dbcee8

2021-05-08 23:22:06 +00:00

libs

…

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac

2021-05-08 16:15:26 +00:00

src/com/android/settings

Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac

2021-05-08 16:15:26 +00:00

tests

Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac

2021-05-08 16:15:26 +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 "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed

2021-05-07 05:11:19 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update battery help message layout

2021-05-04 20:57:19 +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

Change test case name

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

wrap_alpha.py

…