Taran Singh 9e802a9155 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours am: 6c693471db -s ours am: 8da35d66f6 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-07-12 16:42:54 +00:00

libs

…

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3 am: 340d592bbf

2023-07-11 14:43:40 +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-07-06 22:31:41 -07:00

src/com/android/settings

Merge "Remove context from batteryStatusFeatureProvider" into main

2023-07-12 05:03:48 +00:00

tests

Merge "Remove context from batteryStatusFeatureProvider" into main

2023-07-12 05:03:48 +00:00

.gitignore

…

Android.bp

[BiometricsV2] Add retry button

2023-07-11 17:25:26 +08:00

AndroidManifest.xml

Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 47803f6b10 am: fc275fef2e

2023-07-11 09:54:45 +00:00

CleanSpec.mk

…

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

Owners updates

2023-05-24 07:41:50 +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%