Automerger Merge Worker 97246649e4 Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours am: ea17648df4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours am: 5faf8d80c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours am: 26f905aea0 -s ours

2023-10-10 01:38:51 +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

Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda

2023-10-04 18:16:08 +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-09-27 13:38:02 -07:00

src/com/android/settings

Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7 am: a6448e9389

2023-10-09 23:26:11 +00:00

tests

Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7 am: a6448e9389

2023-10-09 23:26:11 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Battery usage page latency improvement (1-8)

2023-08-16 15:12:04 +08:00

AndroidManifest.xml

Use experimental string in user aspect ratio settings

2023-09-22 14:12:25 +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

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%