Automerger Merge Worker 6d68ad5514 [automerger skipped] Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev am: 15b34f0425 -s ours am: ae378da8f0 -s ours ...

am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 8607f3a34e is already in history

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

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

2024-06-21 03:26:01 +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

Limit wifi item edit content's max length to 500 am: 092668676a am: 0a57f0589f am: d80e331ede am: 2f6a54d7de am: 9dfeabd51b am: bc56517fe9 am: 52f79ff225

2024-06-05 19:01:12 +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-02-21 16:01:20 -08:00

src/com/android/settings

Ignore fragment attr from ext authenticator resource

2024-06-04 20:13:51 +00:00

tests

[RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c am: 146d51f2cc

2024-04-04 20:19:04 +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

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

auto import from //depot/cupcake/@135843

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

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +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

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%