Automerger Merge Worker 49f3ae7345 Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 265171b600 -s ours am: f54aaa1106 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 2dc66817ed -s ours am: af736477bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: aff5a4b154 -s ours am: 35727e14e8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 27ef5fc280 -s ours am: f2a8b2e09a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: 0781830995 -s ours am: 4e4c2e91c3 -s ours

2023-05-10 23:32:27 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Refine optimize page log pattern

2023-05-10 10:11:28 +00:00

res

Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c

2023-05-10 16:02:06 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: c3d6820ffd am: 00efff2f18

2023-05-03 21:05:08 +00:00

src/com/android/settings

Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e am: 5a44e6de08

2023-05-10 22:10:24 +00:00

tests

Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd

2023-05-10 17:25:58 +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

Move Note Shortcut from Settings to SystemUI

2023-05-05 14:54:27 +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%