Becca Hughes f34efc3da2 Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I0f7c5509de3ea5000ca77272c32bb2021992d616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-05-03 17:36:16 +00:00

libs

…

protos

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

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

res

Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc

2023-05-02 23:28:04 +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-27 15:15:59 -07:00

src/com/android/settings

Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c

2023-05-03 16:37:22 +00:00

tests

Merge "Align settings with new mocks" into udc-dev am: 21733fa106

2023-05-03 16:36:54 +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

…

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

…

proguard.flags

…

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%