Kevin Chyn 9f395fd0a9 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours ...

am: 587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I2ed1d97f1fa5104e1c381babc2625cb69b147b6c

2019-07-26 18:14:54 -07: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 "Import translations. DO NOT MERGE" into qt-r1-dev

2019-07-26 17:39:58 +00:00

src/com/android/settings

Add ability to finish() ConfirmDeviceCredential if it loses foreground

2019-07-26 18:13:32 -07:00

tests

Remove prerelease driver option from Settings UI. am: c2dfba01ca

2019-07-24 17:25:16 -07:00

.gitignore

Create gitignore for Settings

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

Android.bp

Convert Settings to Android.bp

2019-05-13 13:42:01 -07: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

Updating colors for dark theme

2019-06-06 16:48:29 -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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%