tomhsu e9e59d86ba [automerger skipped] Show dialog on Wifi, and APM' entries in Settings am: c0b39601bf -s ours ...

am skip reason: Merged-In I45cd92a8688e7a619613361ea4a8d58a0984d99f with SHA-1 29b2f16edf is already in history

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

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

2024-05-08 06:06:34 +00:00

aconfig

Use system_ext as the container of the aconfig flags in Settings

2024-05-07 02:29:25 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add new action to log battery optimizaition mode updated by Turbo.

2024-05-07 15:02:01 +08:00

res

Merge "[Settings] Migrate color roles to respect color contrast" into main

2024-05-07 18:17:14 +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-05-03 07:09:35 -07:00

src/com/android/settings

Merge "Show dialog on Wifi, and APM' entries in Settings" into main

2024-05-08 04:37:28 +00:00

tests

Merge "Show dialog on Wifi, and APM' entries in Settings" into main

2024-05-08 04:37:28 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Fix incorrect password attempts messaging on headless

2024-04-19 12:49:31 +00:00

AndroidManifest.xml

Merge "Show persistent notification for page-agnostic mode" into main am: 4795662e6a am: e84cce90b3

2024-05-07 02:43:24 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09: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%