Jeremy Goldman 9e7034bb06 [automerger skipped] Unique display name util uses available, rather than active, subscriptions. am: 9e949b1920 -s ours ...

am skip reason: Change-Id Ief035cf3de3ac03fe348095f36bfb78a41f93d2c with SHA-1 c14e3b3115 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59c0d6277310804d6194f3289c3b447d3cf2e83f

2021-02-04 05:11:50 +00:00

libs

Update proto for contextual_card_list.

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

protos

Card showing mechanism change in homepage

2020-02-14 17:44:11 +08:00

res

Merge "UK emergency alert app rename"

2021-02-04 02:06:32 +00:00

src/com/android/settings

Merge "Unique display name util uses available, rather than active, subscriptions."

2021-02-04 01:31:18 +00:00

tests

Merge "Unique display name util uses available, rather than active, subscriptions."

2021-02-04 01:31:18 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Revert "Export proguard.flags, manifest and sources for use by S..."

2021-01-19 05:23:08 +00:00

AndroidManifest.xml

Merge "Slot Change Receiver Migration" into sc-dev am: 428273765b am: e6da71456f

2021-02-02 01:17:07 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update homepage notification background color

2021-01-15 20:25:55 +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%