Weng Su 4ab81c701e [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: 658383d2e3 -s ours ...

am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ie70befb85b53ebd8f2dbbbba284a763a382ffb23

2021-10-08 07:36:56 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Import translations. DO NOT MERGE ANYWHERE

2021-10-07 02:37:16 +00:00

src/com/android/settings

Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45

2021-10-08 00:01:10 +00:00

tests

[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7

2021-10-06 19:09:43 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Use Lottie animation for traffic light face education

2021-05-24 14:47:19 -07:00

AndroidManifest.xml

BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog

2021-10-06 18:54:38 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update the image for Fingerprint Finish page

2021-06-21 17:20:00 +08:00

NOTICE

…

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

Revert "Update proguard"

2019-02-06 15:44:40 +00:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%