Bill Yi f7185500b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c66d6726f0 -s ours am: 128cd4f2e3 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-06-06 15:42:24 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2023-06-06 13:27:22 +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-05-29 05:31:30 -07:00

src/com/android/settings

Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 7dd84f9399

2023-06-05 19:24:55 +00:00

tests

Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb am: 065885622b

2023-06-05 18:36:44 +00:00

.gitignore

…

Android.bp

Add @UsesReflection to FeatureFactory reflection usage

2023-06-02 20:30:39 +00:00

AndroidManifest.xml

Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d am: e6d4fa7daa

2023-06-06 07:17:45 +00:00

CleanSpec.mk

Move the app to /system_ext

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

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

Owners updates

2023-05-24 07:41:50 +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 presubmit biometrics unit tests

2023-05-09 15:18:50 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%