Anvesh Renikindi 3837556871 [automerger skipped] Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev am: 217c026095 -s ours am: 120964222c -s ours ...

am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a is already in history

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

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

2023-02-16 00:40:07 +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"

2023-02-15 21:38:56 +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-02-09 20:08:07 -08:00

src/com/android/settings

Dismiss dialog on acquire message event.

2023-02-15 18:48:14 +00:00

tests

Merge "Show CombinedBiometric if active unlock enabled"

2023-02-15 18:03:55 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Load app usage events data in the hourly job.

2022-12-15 06:32:54 +00:00

AndroidManifest.xml

Merge "[Settings] Add new permissions for telephony access"

2023-02-14 11:37:21 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix checkcolor_hook error

2023-02-10 15:17:22 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%