Bill Yi a5c4a422e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c16d42d414 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-11-06 20:27:45 +00:00

aconfig

Merge "Settings: add a new developer menu entry to show hdr/sdr ratio overlay." into main

2023-11-03 19:13:06 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Update all forcestop icons in Settings.

2023-11-06 14:12:54 +08: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-19 20:59:36 -07:00

src/com/android/settings

Merge "Disable content protection settings if no service" into main

2023-11-06 18:50:50 +00:00

tests

Merge "Disable content protection settings if no service" into main

2023-11-06 18:50:50 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main

2023-10-31 18:17:00 +00:00

AndroidManifest.xml

Merge "settings(nfc): Remove NFC beam settings" into main

2023-10-30 17:11:17 +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

Update Settings OWNERS file

2023-10-26 19:54:52 +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

Revert "Move SettingsUITests to presubmit"

2023-09-26 07:21:01 +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%