Android Build Merger (Role) e1e01667a7 Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp ...

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours am: e7c298885b -s ours am: ca593c204a -s ours am: 7d3edc88a9 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours am: 2d387349db -s ours am: f7cd796ea8 -s ours am: 152f4c8345 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours am: 971190b08a -s ours am: ab2ad075b3 -s ours am: 05b744c5eb -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

2019-06-05 09:40:35 +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

Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d

2019-06-04 07:43:00 -07:00

src/com/android/settings

Move vibration preview invokation to the correct place am: f8eb8c3c90

2019-06-04 18:51:10 -07:00

tests

Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d

2019-06-04 07:43:00 -07:00

.gitignore

Create gitignore for Settings

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

Android.bp

Convert Settings to Android.bp

2019-05-29 14:45:30 -07:00

AndroidManifest.xml

Reorder notification settings

2019-05-30 16:52:08 -04: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%