Treehugger Robot c894906a05 [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours am: e156d81b9f -s ours ...

am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

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

2023-03-07 19:52:51 +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 confirmation dialog for system locale change." into udc-dev am: 39129e09d3 am: 358c2d9aaa

2023-03-07 04:23:45 +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-27 09:45:29 -08:00

src/com/android/settings

Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2 am: 6994a18c26

2023-03-07 18:54:38 +00:00

tests

Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2 am: 6994a18c26

2023-03-07 18:54:38 +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

Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941

2023-02-23 07:27:18 +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-03-02 21:23:12 +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%