Howard Chen 62d0dab554 [automerger skipped] Merge "Disable factory reset in DSU mode" into tm-qpr-dev am: 702da9e7ab -s ours am: 04a6b4ebb3 -s ours am: 615233b698 -s ours ...

am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55 is already in history

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

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

2024-10-24 08:03:24 +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

Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f am: d498d8b580 am: 00143bf156 am: 22d4e17415

2024-10-24 04:02:20 +00:00

tests

[CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: edf497802d

2024-10-14 22:25: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

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

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%