Treehugger Robot aeeb9341a6 [automerger skipped] Merge "[DON'T BLOCK] Test ownership migration rules" into main am: cca4e91fcf -s ours am: 79bb73b651 -s ours ...

am skip reason: Merged-In I7fbd55a92f4302a6e03bcff0283737fd9295165d with SHA-1 3f65505208 is already in history

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

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

2024-02-12 22:55:55 +00:00

aconfig

Set the container field of aconfig flags

2024-02-07 20:00:41 +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 "Add camera extension fallback toggle" into main

2024-02-09 19:26: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-07 17:04:15 -08:00

src/com/android/settings

Merge "[DON'T BLOCK] Test ownership migration rules" into main

2024-02-12 19:30:40 +00:00

tests

Merge "[DON'T BLOCK] Test ownership migration rules" into main

2024-02-12 19:30:40 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "[DON'T BLOCK] Test ownership migration rules" into main

2024-02-12 19:30:40 +00:00

AndroidManifest.xml

Merge "[ECM] Declare MANAGE_ENHANCED_CONFIRMATION_STATES permission (Settings)" into main

2024-02-08 22:22:46 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +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

Enable Safety Center & Security unit tests on presubmit.

2024-02-08 16:08:40 +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%