app_Settings

Go to file

Phil Weaver f65e790ba0 resolve merge conflicts of 94c5202965 to oc-dr1-dev

Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf

2017-08-30 22:57:39 +00:00

res

Import translations. DO NOT MERGE

2017-08-23 22:15:37 -07:00

src/com/android/settings

resolve merge conflicts of 94c5202965 to oc-dr1-dev

2017-08-30 22:57:39 +00:00

tests

Initialize the volume seekbar preference max and progress.

2017-08-10 20:22:34 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

resolve merge conflicts of 94c5202965 to oc-dr1-dev

2017-08-30 22:57:39 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -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

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00