Bill Yi 9d45161d63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c2f669606 -s ours am: 875ae1db39 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-11-22 23:16:00 +00:00

aconfig

Merge "Make Mainline Module update intent explicit" into main

2023-11-20 18:39:22 +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

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

2023-11-22 21:13:29 +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-19 20:59:36 -07:00

src/com/android/settings

Merge "Show Hotspot network in Network & internet settings" into main

2023-11-22 13:01:07 +00:00

tests

Show Hotspot network in Network & internet settings

2023-11-22 09:58:07 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Don't show quick settings tooltip if the user is in the Setup Wizard,

2023-11-14 23:30:49 +00:00

AndroidManifest.xml

[Audiosharing] Branch existing LE QrCode scanner.

2023-11-14 16:53:10 +08:00

CleanSpec.mk

…

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

…

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%