Treehugger Robot 426231dfc2 [automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: 38906db8fe -s ours ...

am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 323fbda20e is already in history

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

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

2023-11-08 19:27:26 +00:00

aconfig

Add feature flags for VolumePlus

2023-11-07 04:55:49 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge "Updating corner gesture summary string" into main

2023-11-08 18:42:55 +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-10-19 20:59:36 -07:00

src/com/android/settings

Merge "Conditionally add tail button pref" into main

2023-11-08 11:09:28 +00:00

tests

Merge "Conditionally add tail button pref" into main

2023-11-08 11:09:28 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75

2023-11-07 04:48:36 +00:00

AndroidManifest.xml

Merge "settings(nfc): Remove NFC beam settings" into main

2023-10-30 17:11:17 +00:00

CleanSpec.mk

…

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

Update Settings OWNERS file

2023-10-26 19:54:52 +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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%