Daniel Nishi 9f1352b4f3 Fix the UniquePreferenceTest. ...

By adding in the About Phone v2 screen, we duplicated some settings.

This isn't actually a problem because when the flag to turn on V2 is on,
V1 goes away, and vice versa.

Change-Id: I9aa327ac532ed2ac240bb2d6cbb327f299438889
Bug: 72459760
Test: adb shell am instrument -w -e class
com.android.settings.core.UniquePreferenceTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner

2018-01-25 02:26:17 +00:00

res

Merge "Add bluetooth as a supported Slice"

2018-01-24 18:39:18 +00:00

src/com/android/settings

Merge "Add bluetooth as a supported Slice"

2018-01-24 18:39:18 +00:00

tests

Fix the UniquePreferenceTest.

2018-01-25 02:26:17 +00:00

Android.mk

Depend settings on slices in the support library

2017-12-06 08:19:07 -08:00

AndroidManifest.xml

Merge "Fix issue #72116995: Add permission guarding Service#startForeground"

2018-01-24 17:58:50 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Update master switch style

2018-01-10 15:52:20 -08: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

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Enable the color lint check

2017-09-18 17:01:23 -07:00

proguard.flags

Merge "Depend settings on slices in the support library"

2017-12-08 00:51:19 +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%