Weng Su e08d2f1bcc [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05 -s ours am: 82c89c8ef7 -s ours am: 5bc1b45a85 -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: Ibb5863dec16d9681d84005f84297f91797226e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-07-25 21:53:39 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-07-24 09:20:40 -07:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-07-24 09:23:04 -07:00

src/com/android/settings

Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea

2023-07-25 21:52:38 +00:00

tests

Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea

2023-07-25 21:52:38 +00:00

.gitignore

…

Android.bp

Moving FingerprintSettings to Kotlin

2023-07-11 17:43:07 +00:00

AndroidManifest.xml

Moving FingerprintSettings to Kotlin

2023-07-11 17:43:07 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Enable presubmit biometrics unit tests

2023-05-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%