Automerger Merge Worker 61f7877e19 Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours am: 028c16242d -s ours
  [automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c -s ours am: 2471b9f543 -s ours

2023-04-28 10:38:39 +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:41:13 +00:00

res

Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: 4792f21e3d

2023-04-27 21:33:43 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-04-21 20:15:16 -07:00

src/com/android/settings

Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 39b150171b

2023-04-28 04:06:24 +00:00

tests

Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: 386b3b662b

2023-04-28 06:52:48 +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 "Create the Note Task shortcut using the SystemUI Context" into udc-dev

2023-04-26 16:08:34 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

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%