Pajace Chen 9563f1bb4d [automerger skipped] Add charging string V2 for settings am: d9b44a8b9c -s ours ...

am skip reason: Merged-In Ic68bf4231da81d865faa285bca97a929abe26a42 with SHA-1 6f3c97f60a is already in history

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

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

2024-04-16 01:41:54 +00:00

aconfig

Add trunck stable flag for homepage settings UX revamp

2024-04-10 23:32:36 +00:00

libs

…

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 17:45:41 +00:00

res

Merge "Fix talkback announce incorrect sound of the EID" into main

2024-04-15 15:06:21 +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-10 20:37:04 -07:00

src/com/android/settings

Merge "Bluetooth Codec Settings: Assure flag enabled" into main

2024-04-16 01:27:55 +00:00

tests

Merge "Bluetooth Codec Settings: Assure flag enabled" into main

2024-04-16 01:27:55 +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

Revert "Apply "@style/GlifTheme.Light" for Fingerprint enroll activities"

2024-04-11 08:12:12 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook

2024-04-02 07:59:10 +00:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +00:00

PREUPLOAD.cfg

…

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%