Jordan Liu 3a4412ff41 resolve merge conflicts of 7d59c48038 to qt-dev-plus-aosp ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ida3890ed8a15cd50cc993fc9e5e0dd5976088cd3

2019-04-05 13:31:11 -07:00

..

aliases.xml

Clean up styles and aliases

2018-12-26 12:56:48 +08:00

arrays.xml

Remove method that used to get rainbow bt icon

2019-03-28 10:58:55 +08:00

attrs.xml

Add Settings icons needed for theme overlaying.

2019-04-05 07:54:07 -04:00

colors.xml

Merge "Remove method that used to get rainbow bt icon"

2019-03-31 07:03:03 +00:00

config.xml

Disallow Package Installer to be disabled

2019-03-28 13:29:03 +08:00

dimens.xml

Match add network button width to master switch and tint it.

2019-04-04 17:22:10 -07:00

donottranslate.xml

Merge bool.xml and config.xml into one file.

2019-02-06 14:17:53 -08:00

ids.xml

Add dialog for changing display name for mobile network

2019-01-31 12:54:43 -08:00

integers.xml

…

strings.xml

resolve merge conflicts of 7d59c48038 to qt-dev-plus-aosp

2019-04-05 13:31:11 -07:00

styles_preference.xml

Change preferece category text style

2019-03-01 09:40:55 +08:00

styles.xml

Add prepainting background while swiping to dismiss.

2019-03-28 18:35:52 +08:00

themes_suw.xml

Rename prefix from suw to sud

2019-01-04 10:46:20 +08:00

themes.xml

Add Settings icons needed for theme overlaying.

2019-04-05 07:54:07 -04:00