Automerger Merge Worker b42656d9b2 Merge changes from topic "am-1ca2e1a47e4e423f9c474c66ed0d5d7e" ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d -s ours am: 64b45862ff -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea -s ours am: 43b50d85be -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1 -s ours am: 32ba3cfee5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5 -s ours am: 239d59a632 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96 -s ours am: c87f9090cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -s ours am: f8ba0356ed -s ours

2023-04-04 08:42:31 +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 "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev

2023-04-03 23:14:11 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev

2023-04-03 23:14:11 +00:00

src/com/android/settings

Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae am: 7232cf4cc5

2023-04-04 05:30:36 +00:00

tests

Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae am: 7232cf4cc5

2023-04-04 05:30:36 +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

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

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

CleanSpec.mk

…

color-check-baseline.xml

Fix checkcolor_hook error of Settings

2023-03-30 20:51:09 +08:00

NOTICE

…

OWNERS

Merge "Fixes resource file exemption."

2023-01-30 20:28:12 +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%