John Spurlock 1fcb5400b3 resolved conflicts for merge of 3c86a27d to master-lockscreen-dev ...

Change-Id: Idcf46beb8790ff95566942d1633baf70ca5eddf8

2014-04-09 18:33:06 -04:00

..

arrays.xml

Move moveable non-public framework resources up to SystemUI

2013-12-02 17:37:40 -05:00

attrs.xml

Make QS battery composite color match others.

2014-02-04 17:55:47 -05:00

colors.xml

Move legacy notification processing to Notification.Builder

2014-03-27 12:08:55 +01:00

config.xml

Fixing crash when filtering tasks too quickly.

2014-04-04 10:18:24 -07:00

defaults.xml

…

dimens.xml

Enable quick settings from lockscreen and merge into one shade.

2014-04-08 18:25:34 +02:00

donottranslate.xml

…

strings.xml

Put suppressed notifications behind a summary notification.

2014-04-09 16:52:20 -04:00

styles.xml

Fix recents theme, add missing headers

2014-04-02 15:39:13 -07:00