Taran Singh da8b9fab30 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours ...

am skip reason: subject contains skip directive

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

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

2023-07-06 21:05:40 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev

2023-07-05 15:11:09 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-06-21 16:33:47 -07:00

src/com/android/settings

Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev

2023-07-05 15:11:09 +00:00

tests

Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev

2023-07-05 15:11:09 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev

2023-06-06 05:49:40 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Update Settings owners list

2023-04-12 01:48:48 +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

Enable presubmit biometrics unit tests

2023-05-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%