Automerger Merge Worker aaa7df3839 Merge changes from topic "am-f5e745cc763042748e9770118de4792b" into main ...

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours am: c86183ec60 -s ours am: c7052d15af -s ours am: d58a47c4d0 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours am: 2f8d8d1d79 -s ours am: 3759d6c76e -s ours am: bb149b50b8 -s ours

2023-08-08 03:58:07 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778 am: b41875eff3

2023-08-07 20:33:36 +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-08-03 18:10:32 -07:00

src/com/android/settings

Merge "Refersh saved Wi-Fi networks" into main

2023-08-08 02:29:39 +00:00

tests

Merge "Refersh saved Wi-Fi networks" into main

2023-08-08 02:29:39 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev am: a9a8c4ed19 am: 4b038ad59b

2023-07-28 19:30:09 +00:00

AndroidManifest.xml

Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev am: 830c9eec71 am: 4488c05a48

2023-08-03 09:46: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

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +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 presubmit biometrics unit tests

2023-05-11 06:07:08 +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%