Automerger Merge Worker c941deba62 Merge changes from topic "am-699faa000aaa4f2a94589911cef091e9" into main ...

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours am: 26818cc553 -s ours am: 060b6cffd0 -s ours am: 44a17aed24 -s ours am: 4939cc6916 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours am: 0c1eda54b8 -s ours am: f64a344656 -s ours am: 786a98aa51 -s ours am: ad9bae44a1 -s ours

2024-06-24 20:23:48 +00:00

aconfig

Merge "Retrieve WifiDppQrGeneratorFragment at runtime." into main

2024-06-19 06:56:42 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add AppOptimizationModeEventsUtils to save & update app optimization mode expiration events.

2024-06-03 19:42:26 +08:00

res

Merge "Add "delete mode" option on mode configuration page" into main

2024-06-24 19:30: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

2024-06-13 14:48:04 -07:00

src/com/android/settings

Merge "Add "delete mode" option on mode configuration page" into main

2024-06-24 19:30:47 +00:00

tests

Style priority modes items in aggregator

2024-06-24 11:56:11 +02:00

.gitignore

Update .gitignore list

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

Android.bp

Migrate Settings intents

2024-06-20 12:48:40 -04:00

AndroidManifest.xml

Merge "Opt out of predictive back for biometrics" into main

2024-06-24 18:26:23 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +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 VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%