Kevin Liu c41c1fb83c Revert "[automerger skipped] resolve merge conflicts of 521278a0..." ...

Revert submission 20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Reason for revert: Automerger did skipped some of the important CLs will resubmit to tm-qpr-dev

Reverted changes: /q/submissionid:20943849-am-ba81bb49f0b54fb08295adf7418e1fd4

Change-Id: Ib639a1d8c81a1b3fcd8504704f55854fc36f4cb5

2023-01-11 18:24:54 +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

Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90

2023-01-11 14:34:49 +00:00

src/com/android/settings

Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07

2023-01-11 15:30:41 +00:00

tests

Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07

2023-01-11 15:30:41 +00:00

.gitignore

…

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%