Treehugger Robot dc76b947df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 6450b92abf -s ours ...

am skip reason: contains skip directive

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

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

2024-03-29 22:36:32 +00:00

aconfig

Merge "fix(magnification): make always on toggle unavailable when capabilities is window only" into main

2024-03-29 19:09:35 +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 "Revert "Add waiting screen before PS setup completion"" into main

2024-03-29 21:43:30 +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-03-21 21:12:36 -07:00

src/com/android/settings

Merge "Implement policy transparency for CredMan" into main

2024-03-29 22:20:11 +00:00

tests

Merge "Modify test to accomodate unchangable flag" into main

2024-03-29 20:58:10 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Statically inlcude the frameworks flags lib

2024-03-20 15:45:44 +00:00

AndroidManifest.xml

ApnSettingsActivity shows the ActionBar

2024-03-27 13:45:28 +08: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%