Automerger Merge Worker eafb5594fe Merge changes from topic "am-3324be7194124a63b43a64e9b5596abe" ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours am: 956f1001fb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours am: f99e320351 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours am: e8971c92c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours am: 825c3da34d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours am: b1a3ff1600 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours am: 4cd3e99f74 -s ours

2023-04-19 06:45:30 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:48:08 +08:00

res

Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779 am: 3abe7779e0

2023-04-18 20:02:30 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e

2023-04-17 18:22:58 +00:00

src/com/android/settings

Merge "Rollback decision to merge by package name"

2023-04-19 00:08:57 +00:00

tests

Merge "Rollback decision to merge by package name"

2023-04-19 00:08:57 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev

2023-04-18 19:36:45 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix empty icon while tapping Auto-rotate screen widget

2023-04-11 17:22:18 +08:00

NOTICE

…

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +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

Add AppStoragePreference for Spa

2022-10-13 17:21:08 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%