Weng Su efb2543e93 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours ...

am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a

2021-03-05 18:12:04 +00:00

libs

Update proto for contextual_card_list.

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

protos

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

res

RESTRICT AUTOMERGE Update String

2020-12-30 18:34:05 -08:00

src/com/android/settings

[Security Report] Fix Settings WifiScanModeActivity Overlaid issue

2021-02-01 03:42:15 +00:00

tests

Remove prerelease driver option from Settings UI.

2019-07-23 21:18:10 +00:00

.gitignore

Create gitignore for Settings

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

Android.mk

Add SettingsIntelligenceLogwriter

2019-03-27 07:14:20 +08:00

AndroidManifest.xml

Merge "Add UI for mainline modules licenses." into qt-dev

2019-06-28 16:56:04 +00:00

CleanSpec.mk

Move Settings app to /product

2018-12-18 09:51:08 +00:00

color-check-baseline.xml

Revert "Revert "Make subsettings display edge-to-edge""

2019-05-14 13:48:12 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Update Settings owners

2019-05-02 01:44:42 +00:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Revert "Update proguard"

2019-02-06 15:44:40 +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%