Sorin Basca 464a297b42 [automerger skipped] Use Mockito 4.6.1 API am: 93c143ed0a -s ours am: 407a35aa78 -s ours ...

am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

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

2023-01-04 15:59:32 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Move fuelgauge_usage_state.proto into fuelgauge folder.

2022-12-02 15:00:58 +08:00

res

Replace battery usage breakdown list from tabs to dropdown list.

2023-01-04 16:20:47 +08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-12-28 06:36:24 +00:00

src/com/android/settings

Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd am: 2fa3b95342

2023-01-04 12:27:50 +00:00

tests

Merge "Replace battery usage breakdown list from tabs to dropdown list."

2023-01-04 12:17:41 +00:00

.gitignore

…

Android.bp

Load app usage events data in the hourly job.

2022-12-15 06:32:54 +00:00

AndroidManifest.xml

Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422

2023-01-03 13:25:59 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Merge "Revert "Add a cursor preference to Accessibility Settings""

2022-10-11 23:00:34 +00:00

NOTICE

…

OWNERS

Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 am: 486c74f4fa

2022-11-15 07:14:53 +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

Add AppStoragePreference for Spa

2022-10-13 17:21:08 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%