Jacky Wang 2bc6aebf14 [automerger skipped] [DataStore] Support backup data state computation am: 85e130ad7a -s ours ...

am skip reason: Merged-In I8ad4f2788f9f364eceb1bca841830e1f3a68fe77 with SHA-1 5847d50e7b is already in history

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

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

2024-03-13 06:56:03 +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

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

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

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%