changbetty 3afa2f08f2 [automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492 am: 7888fcc82b -s ours am: e7f0596113 -s ours ...

am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

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

2023-01-07 09:09:06 +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

Import translations. DO NOT MERGE ANYWHERE

2023-01-05 18:07:21 -08:00

src/com/android/settings

Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12

2023-01-07 07:57:39 +00:00

tests

Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64

2023-01-06 20:28:41 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Added intro lottie for foldable.

2022-11-04 02:57:38 +00:00

AndroidManifest.xml

Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422

2023-01-03 13:25:59 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Revert "Use Mockito 4.6.1 API"

2023-01-05 05:15:10 +00:00

NOTICE

…

OWNERS

Update owner for Settings project

2022-11-09 10:24:52 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Import the window extension libary in the Settings app

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

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%