Xin Li b14a7842b1 [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 300b455081 -s ours ...

am skip reason: Merged-In Iebec11afc62ecb79386e1866af57cd4e68461a95 with SHA-1 41902bb0c5 is already in history

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

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

2024-06-20 21:46:17 +00:00

aconfig

Merge "Retrieve WifiDppQrGeneratorFragment at runtime." into main

2024-06-19 06:56:42 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add AppOptimizationModeEventsUtils to save & update app optimization mode expiration events.

2024-06-03 19:42:26 +08:00

res

Design refresh for modes that don't filter notifications

2024-06-20 13:10:36 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-06-13 14:48:04 -07:00

src/com/android/settings

Merge "Load and process the battery reattribute data in the periodic job (3/5)" into main

2024-06-20 16:28:03 +00:00

tests

Design refresh for modes that don't filter notifications

2024-06-20 13:10:36 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Biometrics Enrollment refactor (7/N)

2024-06-05 18:18:59 +00:00

AndroidManifest.xml

Fix Settings restart during Reset mobile nework settings flow

2024-06-19 14:41:19 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +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 VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +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%