Automerger Merge Worker d377f94682 [automerger skipped] Merge changes from topic "am-c912ebbb4b2e4d4a989f68e5d69b4df0" into tm-d1-dev-plus-aosp am: 245a10ec00 -s ours am: 34da1ed85b -s ours ...

am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

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

2022-08-11 05:37:49 +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 "Add pair button in bluetooth details page for hearing aid device"

2022-08-10 10:42:35 +00:00

src/com/android/settings

Merge "Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow"

2022-08-11 01:17:03 +00:00

tests

Merge "Add pair button in bluetooth details page for hearing aid device"

2022-08-10 10:42:35 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Enable Kotlin for Settings App

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

AndroidManifest.xml

Remove singleTask from Settings homepage

2022-08-10 08:06:47 +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 ykhung to the Settings Owners file

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