Weng Su b70ace131b [automerger skipped] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 0ea027a71c am: 146d51f2cc am: 1f2fc04f17 -s ours ...

am skip reason: contains skip directive

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

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

2024-04-04 20:36:03 +00:00

aconfig

Merge "fix(magnification): make always on toggle unavailable when capabilities is window only" into main

2024-03-29 19:09:35 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 16:54:41 +00:00

res

Merge "Remove 'Hide Sensitive Notifications' item from PS settings page" into main

2024-04-04 17:08:04 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-04-01 23:55:30 -07:00

src/com/android/settings

Merge "Show "no thanks" button when scroll is not needed." into main

2024-04-04 18:17:35 +00:00

tests

Merge "Show "no thanks" button when scroll is not needed." into main

2024-04-04 18:17:35 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

Statically inlcude the frameworks flags lib

2024-03-20 15:45:44 +00:00

AndroidManifest.xml

Use SpaDialogWindowTypeActivity for WEP dialog

2024-04-03 15:26:26 +08:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

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

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Enabling private space unit tests in presubmit

2024-03-25 12:38:39 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%