Jacky Wang f0f0438d68 [automerger skipped] Reset app preferences does not trigger backup for App battery usages am: 081dbac72e -s ours ...

am skip reason: Merged-In Ia3917c8dc2654185f5f048c048362fd47379b7d1 with SHA-1 ef8a51fac8 is already in history

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

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

2024-03-13 06:56:14 +00:00

aconfig

Merge changes I69049a13,I7fcc01b8 into main

2024-02-28 19:38:27 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 16:54:41 +00:00

res

Merge "Update Settings homepage color role mappings" into main

2024-03-12 20:56:49 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Merge "Show QS shortcut option if the a11y feature provides a tile." into main

2024-03-08 17:20:15 +00:00

src/com/android/settings

Merge "Fix certX509 has not been initialized." into main

2024-03-13 06:42:51 +00:00

tests

Merge "Fold [GoldenImagePathManager] into [GoldenPathManager] #cleanup" into main

2024-03-12 17:42:03 +00:00

.gitignore

Update .gitignore list

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

Android.bp

[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage

2024-03-03 22:42:00 +08:00

AndroidManifest.xml

Enable android:restoreAnyVersion

2024-03-08 16:41:56 +08:00

CleanSpec.mk

…

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +08:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +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

Enable Safety Center & Security unit tests on presubmit.

2024-02-08 16:08:40 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%