Xin Li 8782334946 [automerger skipped] Merge 10952656 am: 596efc7e94 -s ours am: 0c4f756bca -s ours ...

am skip reason: Merged-In Ib02ae9caef06a46938947806dac8aabb1fa12d94 with SHA-1 8319a77527 is already in history

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

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

2023-10-19 23:54:29 +00:00

aconfig

fingerprint pre-enroll calibration

2023-10-18 04:25:14 +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

Remove NetworkProviderSimsCategoryController

2023-10-19 15:56:22 +08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-10-06 15:42:54 -07:00

src/com/android/settings

Merge "Remove NetworkProviderSimsCategoryController" into main

2023-10-19 12:53:38 +00:00

tests

Merge "Add a test for the NPE case" into main

2023-10-19 17:10:25 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

Merge "Settings for Polite Notifications" into main

2023-10-11 12:04:37 +00:00

AndroidManifest.xml

Fix battery usage database is not clear when time is changed

2023-10-11 17:40:14 +08:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09: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

Revert "Move SettingsUITests to presubmit"

2023-09-26 07:21:01 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%