Colin Cross 4fda9e8e42 [automerger skipped] Merge "Fix kotlin nullable errors in Settings" into aosp-main-future am: f87c5f2cfc -s ours am: 7076317476 -s ours am: b66a576c96 -s ours am: aa33b6586f -s ours ...

am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a is already in history

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

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

2023-09-12 22:55:42 +00:00

aconfig

Add LocaleNotificaiton feature flag

2023-08-29 07:58:02 +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 "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde355 am: 7d297719d7

2023-09-12 12:11:47 +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-07 04:18:01 -07:00

src/com/android/settings

Merge "Add dependency on BiometricsSharedLib." into main

2023-09-12 21:32:02 +00:00

tests

Merge "Fix test failure of AvailableMediaDeviceGroupControllerTest" into main

2023-09-12 06:06:08 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Add dependency on BiometricsSharedLib.

2023-09-11 19:00:14 +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

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

Fix more SettingsUITests

2023-09-09 22:02:56 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%