Automerger Merge Worker 0ef373f9b9 Merge changes from topic "am-2194a6a85b914b21804de4e27b3bc48e" into tm-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 85f117afe7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours am: 08462bff56 -s ours

2022-05-21 02:45:22 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev

2022-05-19 00:41:39 +00:00

src/com/android/settings

Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3

2022-05-21 02:44:42 +00:00

tests

Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998

2022-05-21 00:02:22 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Fix incorrect battery icon showing on the recent apps

2022-05-18 12:18:15 +08:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color lint

2022-04-11 20:40:18 +08:00

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00:00

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

Import the window extension libary in the Settings app

2021-08-19 17:23:11 +08:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00: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%