Automerger Merge Worker 19e06f74c8 Merge changes from topic "am-b5e91ab227294ed58bbb399b5c08944f" into sc-v2-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours am: f19c1f0ed1 -s ours
  [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours am: dadde79d59 -s ours

2021-10-08 07:49:52 +00:00

libs

Update window aar

2021-10-01 10:15:03 -07:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev

2021-10-07 08:40:55 +00:00

src/com/android/settings

Merge "Update to new method of getting display power profile constants" into sc-v2-dev am: d754409050

2021-10-08 06:21:16 +00:00

tests

[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7

2021-10-06 19:09:43 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08:00

AndroidManifest.xml

[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 5cbaa375cd

2021-10-06 19:08:53 +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

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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-24 12:01:35 +08:00

TEST_MAPPING

Change test case name

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

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%