Chaohui Wang b6675ea4a8 [automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b am: a8e4522f8c -s ours ...

am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4b8 is already in history

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

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

2024-12-04 02:33:48 +00:00

aconfig

Merge "Add AppInfo setting for page size appcompat" into main

2024-11-27 10:25:02 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Fix search for MMS Message

2024-07-30 11:34:24 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-12-03 19:46:35 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-12-02 19:18:07 -08:00

src/com/android/settings

Merge "[Catalyst] Refine WifiSwitchPreference" into main

2024-12-04 01:42:50 +00:00

tests

Merge "Cleaning up quick settings flag in Settings app" into main

2024-12-03 22:03:04 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

[Physical Keyboard] Add intent support for PK layout setting page

2024-12-02 09:12:25 +00:00

AndroidManifest.xml

Merge "New System API to launch SIM Preference in Setting" into main

2024-12-04 01:31:58 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +00:00

PREUPLOAD.cfg

Disable checkcolor hook

2024-11-22 12:59:43 +00:00

proguard.flags

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00:00

TEST_MAPPING

Enable VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%