Bill Yi 2ecb751e5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bc882dc6a6 -s ours am: 61d9f6cff0 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-09-08 23:29:44 +00:00

aconfig

Add LocaleNotificaiton feature flag

2023-08-29 07:58:02 +00:00

libs

…

protos

Add a mechanism to log battery usage periodic job events

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

res

Merge "Clean up WifiDataUsageSummaryPreferenceController" into main

2023-09-08 08:03:18 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-08-30 20:15:36 -07:00

src/com/android/settings

Merge "Change feature flag to device config flag." into udc-qpr-dev am: 54f96175a2 am: 04960fa7c3

2023-09-08 23:21:05 +00:00

tests

Merge "Fix some SettingsUITests" into main

2023-09-08 11:46:23 +00:00

.gitignore

…

Android.bp

Remote authenticator enrollment navigation.

2023-08-31 21:24:09 +00:00

AndroidManifest.xml

Merge "Revert^2 Remove Winscope tracing QS development tile" into main

2023-09-04 07:50:36 +00:00

CleanSpec.mk

…

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

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +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%