Automerger Merge Worker 0e8a6be197 Merge changes from topic "am-603210be7bca4b488a2eadf8eec75652" into sc-v2-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours am: c2174cc506 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours am: e51d5d2917 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours am: aa53b5bbc0 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours am: d751d3c934 -s ours

2021-10-08 07:50:33 +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

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%