Vineel Sadineni 245cb5f6d6 [automerger skipped] Merge "Make MoreOptionsScope abstract class" into main am: 62d6ccd106 am: 7b16a62bb2 -s ours ...

am skip reason: Merged-In Iced9df83f600c86cc409abc040fb9ace0dcedf1e with SHA-1 97d36b771a is already in history

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

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

2024-01-26 20:19:35 +00:00

aconfig

Merge changes I3ae8f945,I126ef66d into main

2024-01-25 05:08:40 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge changes I99011feb,Ie066077f,I44e631cb into main

2024-01-26 09:48:42 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Update string for incompatible charging

2024-01-23 01:40:47 +00:00

src/com/android/settings

Merge "Add try/catch to handle invalid settings activity" into main

2024-01-26 18:58:30 +00:00

tests

Merge "Restrict WifiDialogActivity" into main

2024-01-26 10:56:00 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Add SettingsLintDefaults to Settings-core

2024-01-17 15:02:38 +08:00

AndroidManifest.xml

Merge "Created a dedicated activity for EditShortcutsPreferenceFragment. This will allow it to be reached via intent." into main

2024-01-25 21:33:33 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

…

OWNERS

Update Settings OWNERS file

2023-10-26 19:54:52 +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

Revert "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%