Becca Hughes a983d78b71 [automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683 am: 79fb783267 -s ours ...

am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 fb4488ea83 is already in history

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

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

2023-03-21 00:43:45 +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 "Add missing conversation field" into udc-dev am: 2494fd0187 am: f448aec29d

2023-03-20 23:22:32 +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-03-16 16:53:20 -07:00

src/com/android/settings

Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123 am: b4240202a2

2023-03-20 23:33:47 +00:00

tests

Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7 am: 989a724787

2023-03-20 23:27:53 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Support remote device credentials validation in UI.

2023-02-15 23:23:17 -08:00

AndroidManifest.xml

Add configChanges for PowerUsageSummaryActivity for rotation

2023-03-09 15:22:12 +08:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update color-check-baseline.xml

2023-03-16 02:29:38 +00: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%