Bill Yi a7e2ec53fa [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours am: 46b5269704 -s ours am: c4f67d32b4 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-07-08 22:06:08 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Fix the font size inconsistency on "Erase all data" page.

2022-07-07 02:21:11 +00:00

src/com/android/settings

[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: cf15fcf81d

2022-07-08 19:24:47 +00:00

tests

Merge "Fix extra dim turns on failed in setting search bar"

2022-07-07 21:06:04 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

2022-05-30 01:58:25 +08:00

AndroidManifest.xml

Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35

2022-06-22 19:43:37 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Clean up unused string resource sync_plug

2022-06-01 18:43:10 +08:00

NOTICE

…

OWNERS

Add ykhung to the Settings Owners file

2022-06-24 05:58:57 +00:00

PREUPLOAD.cfg

…

proguard.flags

Import the window extension libary in the Settings app

2021-08-19 17:23:11 +08:00

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%