Himanshu Rawat ebdad23080 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 99d6748582 -s ours am: a06469ea63 -s ours ...

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

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

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

2022-08-09 08:12:09 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

[Settings] Code refactor - NetworkModePreference

2022-03-19 10:46:06 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-08-08 13:47:57 +00:00

src/com/android/settings

Merge "[Settings] Data warning & limit UI should be configuable when running out of limit"

2022-08-09 03:47:33 +00:00

tests

Merge "Use setting as base activity for fingerprint"

2022-08-09 00:05:45 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

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

AndroidManifest.xml

Merge "Unify the caption preference class naming"

2022-08-02 22:15:31 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Bool to note Pending Intent bug fixed

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

NOTICE

…

OWNERS

Add ykhung to the Settings Owners file

2022-06-24 05:58:57 +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%