Zoey Chen 6c2b3ca25c [automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea am: 3d7b3abff5 -s ours am: 5c8a325f23 -s ours ...

am skip reason: Merged-In Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 with SHA-1 3043c87f98 is already in history

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

Change-Id: I41244d873d0b5e894b03fd04e2c3b4b2d42a9e28

2021-08-24 03:26:08 +00:00

libs

Import the window extension libary in the Settings app

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

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Update Memory progressbar style in Developer options" into sc-v2-dev am: 2919585538 am: 4af312f397

2021-08-23 18:33:37 +00:00

src/com/android/settings

Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4 am: e1a95327ea

2021-08-23 17:54:17 +00:00

tests

Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev am: c63c0d4370 am: 0249ae9582

2021-08-23 05:55:43 +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 "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: 0050cbc711

2021-08-23 16:42:45 +00: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

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%