Automerger Merge Worker e614fd781c Merge changes from topic "am-619ea875108a44d7b91bdc1543c31952" ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 9d95faadcf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: 99d855e12d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 31eb96784f -s ours

2023-06-21 06:56:14 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8

2023-06-20 17:48:39 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 94f5c7a913

2023-06-20 07:46:39 +00:00

src/com/android/settings

Merge "[BiometricsV2] Refactor EnrollingRfpsFragment"

2023-06-21 04:55:47 +00:00

tests

Merge "[BiometricsV2] Rewrite Activity to Kotlin"

2023-06-17 02:36:17 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Clean up Settings_srcs & Settings_manifest

2023-06-13 02:16:23 +00:00

AndroidManifest.xml

Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa

2023-06-15 07:19:57 +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

Owners updates

2023-05-24 07:41:50 +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%