Yasin Kilicdere 77522a55b6 Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452 am: 541a984ce0 ...

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

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

2023-01-03 23:35:03 +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

Merge "[Regional Preference] Add each option entry"

2022-12-30 03:20:13 +00: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 "Add SpaAppBridgeActivity for application usage"

2023-01-03 03:06:18 +00:00

tests

Fix AppDataUsagePreferenceTest#whenHasDataUsage

2023-01-03 11:47:25 +08:00

.gitignore

…

Android.bp

Load app usage events data in the hourly job.

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

AndroidManifest.xml

Merge "Add SpaAppBridgeActivity for application usage"

2023-01-03 03:06:18 +00:00

CleanSpec.mk

…

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%