Settings: Simplified Chinese Translations

Change-Id: Ibdda81d451fc83f15accc89f51342e3df3fe35d0
Settings: Simplified Chinese Translations

Change-Id: I6330d8789e795fc61391b00498d4d3fd71ccffb7

Conflicts:
	res/values-zh-rCN/cm_strings.xml
Settings: Simplified Chinese Translations

Change-Id: Ifedc122d773aadde8d24fe6acbf5beb8289f6c17
improve shortcut bar (1/2)

Change-Id: I2062f5848f0616d7e29dcc08449f450148d28a8f

Conflicts:
	res/values-zh-rCN/mk_strings.xml
	res/values/mk_strings.xml
	res/xml/navbar_settings.xml
shortcut bar support exclude app (1/2)

Change-Id: If99a269d25fb3387dcf9d03946ec67877821a551

Conflicts:
	res/values-zh-rCN/mk_strings.xml
	res/values/mk_strings.xml
	res/xml/navbar_settings.xml
	src/com/android/settings/kylinmod/RecentShortCutPriority.java
Smart MainActivity name in shortcut (2/2)

Change-Id: Ia2d4ff698a9266e1787d6b683ea068e95dab2376

Conflicts:
	src/com/android/settings/kylinmod/RecentShortCutPriority.java
Settings: code cleanup

Change-Id: I4bd9ad9d059650f1940895491f9598bf9480d037
Settings: fix NPE

Change-Id: I3d5e2f31bd9d6f892b6b3db0912c8277a8c01c8d
Settings: Add stay awake timeout in Quick Settings and Display Settings (2/2)

Thanks to SlimRoms for the idea

Change-Id: Ibde853fb883fa50bac8457feb7e309a5608bbd29
Settings: Better description when stay awake is selected

Change-Id: I9a0e4c3276ca2ebe87232d9f208e1a4d366261ed

Conflicts:
	res/values/mk_strings.xml
Settings: Update translations

Change-Id: Ia7feb37ffc4414676a46a450d40df8a190307627
Settings: Simplified Chinese Translations

Change-Id: Id787c0b1d87558dfee0688fa9c8ff32a3fffc435
Settings: Better management of long press screen timeout tile to stay awake (2/2)

Change-Id: I6df3ebfd76ac2a6dfac838681af6d09e6def0f58

Conflicts:
	src/com/android/settings/DisplaySettings.java
fix recent shortcut drawable (2/2)

Change-Id: I77fd4b24cd9ab4fc68c3d44d556647fd2f6dd94b
recent shortcut gravity (2/2)

Change-Id: I957893e135ef27ed862cee1e41502ed8eeac541f

Conflicts:
	res/values-zh-rCN/km_strings.xml
	res/values/km_arrays.xml
	res/values/km_strings.xml
	res/xml/recent_shortcut_settings.xml
improve shortcut bar

Change-Id: I11a822a52f85e5842ea9299acd3abf5ee8cc7c17

Conflicts:
	src/com/android/settings/kylinmod/RecentShortCutPriority.java
recent shortcut bar bug fix

Change-Id: I3b7eb3261140d64b6c5c88dd39c040bd607be9fa
Settings: Simplified Chinese Translations

Change-Id: I9a361349064e96a4a491e1ced0bf7cc50aeb833e

Conflicts:
	res/values-zh-rCN/cm_strings.xml
code cleanup
Merge pull request #2 from KylinMod/kitkat

Merge branch "KylinMod" into mikylin