Himanshu Rawat 5dd2f5e3ee [automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50 -s ours ...

am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 dc7aa0e87f is already in history

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

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

2022-08-02 02:01:11 +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 "Bool to note Pending Intent bug fixed" into tm-qpr-dev

2022-07-27 20:19:42 +00:00

src/com/android/settings

Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev

2022-07-29 00:27:41 +00:00

tests

Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev

2022-07-27 13:11:50 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

2022-05-30 01:58:25 +08:00

AndroidManifest.xml

Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35

2022-06-22 19:43:37 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Bool to note Pending Intent bug fixed

2022-07-21 11:01:15 +00:00

NOTICE

…

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00:00

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08: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%