Treehugger Robot 978e1ac879 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours am: 9d867703c5 -s ours am: f2f13ca90a -s ours am: bde04e31cd -s ours ...

am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: I21581a274588f2b2501244ff2c63bd536b903e88

2020-10-20 21:18:54 +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 "Add string for text of bluetooth switch" am: 868a15350a

2020-10-19 09:29:47 +00:00

src/com/android/settings

Merge "Revert "Modify the privacy controller to be selectable in the next updateState()""

2020-10-20 03:20:36 +00:00

tests

Merge "Revert "Modify the privacy controller to be selectable in the next updateState()""

2020-10-20 03:20:36 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Do not exlicitly declare dependency on changeid processor.

2020-03-26 15:59:13 +00:00

AndroidManifest.xml

Merge "Remove dup READ_PRIVILEGED_PHONE_STATE permission" am: 3eb10277da am: 6d5943e6b8 am: bfc09343cd am: 2f3b18d91d

2020-10-14 10:41:50 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color lint errors

2020-09-30 16:09:05 +08:00

NOTICE

auto import from //depot/cupcake/@135843

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

OWNERS

Update owner list

2020-09-24 10:18:08 +00:00

PREUPLOAD.cfg

Add the checkstyle_hook into PREUPLOAD.cfg

2019-10-14 21:03:17 +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%