Howard Chen 663c05e524 Merge "Disable factory reset in DSU mode" into main am: 8136e6d397 am: 8524cc8afd am: 9a7e7e0ed9 ...

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

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

2023-11-15 09:55:37 +00:00

aconfig

Merge changes from topic "wv-dev-opt" into main

2023-11-14 22:54:03 +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 changes I7a017026,I76a5c940 into main am: 520d7c6758 am: 6d96b61bfa am: 0a173b2618

2023-11-15 08:32: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-10-19 20:59:36 -07:00

src/com/android/settings

Merge "Disable factory reset in DSU mode" into main am: 8136e6d397 am: 8524cc8afd am: 9a7e7e0ed9

2023-11-15 09:55:37 +00:00

tests

Merge "Unconditionally enable ANGLE developer option UI." into main

2023-11-15 01:38:35 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge changes from topic "wv-dev-opt" into main

2023-11-14 22:54:03 +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%