Treehugger Robot edc4e3c5e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b1c087f6ea -s ours am: a05cf53404 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-10-03 18:17:59 +00:00

aconfig

Merge "Fix missing declared accessibility PreferenceControllers." into main

2023-10-03 08:22:02 +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 "Update settings dialog to use new string" into main

2023-10-03 15:59:08 +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-10-02 07:07:06 -07:00

src/com/android/settings

Hide settings app for private profile from launcher.

2023-10-03 11:33:54 +00:00

tests

Merge "Fix code inspection test for slice controllers" into main

2023-10-03 17:44:42 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Add feature flags for Factory Reset Wizard.

2023-09-29 18:17:18 +00:00

AndroidManifest.xml

Merge "Fix notificaiton not working in work profile" into main

2023-10-03 02:11:34 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00: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

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

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%