TreeHugger Robot adca3e7662 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 732da7a440 -s ours am: e4c447eb02 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-01-17 07:12:22 +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 "Import translations. DO NOT MERGE ANYWHERE"

2023-01-17 05:57:01 +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-01-15 19:27:58 -08:00

src/com/android/settings

Merge "Force Settings to align locales of embedded activities"

2023-01-17 05:40:53 +00:00

tests

Merge "Ignore unit test to avoid timing issue"

2023-01-17 05:46:47 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

Android.bp

Load app usage events data in the hourly job.

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

AndroidManifest.xml

Merge "Add a feature flag for the special access to the long background task"

2023-01-13 01:10:15 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Fix checkcolor_hook error

2023-01-12 22:00:44 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

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%