Anna Bauza 990b007f03 [automerger skipped] Merge "Integrating new Avatar Picker App in Settings" into main am: cb9cd3fa46 am: 469cc72050 -s ours ...

am skip reason: Merged-In Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b with SHA-1 e6c9a08ab7 is already in history

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

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

2024-04-23 12:35:13 +00:00

aconfig

Merge "Add trunk stable flag for slice retirement" into main

2024-04-19 09:57:05 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 16:54:41 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-04-22 20:43:13 +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-04-18 22:31:33 -07:00

src/com/android/settings

Merge "Add a try-catch statement to handle the runtime exception" into main

2024-04-23 10:51:29 +00:00

tests

Merge "Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."" into main

2024-04-23 09:12:48 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Fix incorrect password attempts messaging on headless

2024-04-19 12:49:31 +00:00

AndroidManifest.xml

Merge "Add READ_SYSTEM_GRAMMATICAL_GENDER to Settings app" into main

2024-04-22 07:27:19 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +08:00

NOTICE

…

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

Enabling private space unit tests in presubmit

2024-03-25 12:38:39 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%