Xin Li 8767313e05 [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours am: 7c297fa38a -s ours ...

am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d9b48478314d125c5d1db99ac28d97486e2f06d

2021-02-23 10:34:10 +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-21 08:50:16 -08:00

res

Remove "Battery optimization" from Special app access page

2021-02-23 06:10:51 +00:00

src/com/android/settings

Merge "Add collapsing toolbar to Notification history page" into sc-dev

2021-02-23 06:58:58 +00:00

tests

Remove "Battery optimization" from Special app access page

2021-02-23 06:10:51 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Merge changes from topic "SettingsGoogle-bp-rvc-qpr-dev-plus-aosp" into sc-dev

2021-02-23 04:12:51 +00:00

AndroidManifest.xml

Merge "Add collapsing toolbar to Notification history page" into sc-dev

2021-02-23 06:58:58 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix the issue of the repo upload hooking checker

2021-02-09 21:41:48 +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

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

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%