Bill Yi 16a01e514c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8 -s ours am: d4eac8f347 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-09-25 21:01:23 +00:00

aconfig

Merge "Update bug id for feature flag." into main

2023-09-21 09:00:37 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

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

2023-09-25 20:17:47 +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-09-22 02:57:41 -07:00

src/com/android/settings

Merge "Added SearchIndexable to FP pref controller" into main

2023-09-25 20:23:43 +00:00

tests

Merge "When device has a call, avoid user inactive/active SIM." into main

2023-09-25 06:59:44 +00:00

.gitignore

…

Android.bp

Add controls in dev options to quarantine apps.

2023-09-18 07:27:37 +00:00

AndroidManifest.xml

Add "Previously connected devices" activity in settings for system ui QS bluetooth dialog.

2023-09-25 02:28:54 +00:00

CleanSpec.mk

…

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

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +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

Fix more SettingsUITests

2023-09-09 22:02:56 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%