Skip to content

Conversation

@VlikeBanana
Copy link
Member

No description provided.

Steve Kondik and others added 2 commits April 17, 2016 21:51
 * Remove all LiveDisplay-related code from the framework, and
   update the QS tile for the new API.

Change-Id: I41c04a254afa91c0ed26c050362b63049d489fba

Conflicts:
	core/res/res/values-af/cm_strings.xml
	core/res/res/values-am/cm_strings.xml
	core/res/res/values-ar/cm_strings.xml
	core/res/res/values-as-rIN/cm_strings.xml
	core/res/res/values-ast-rES/cm_strings.xml
	core/res/res/values-az-rAZ/cm_strings.xml
	core/res/res/values-be/cm_strings.xml
	core/res/res/values-bg/cm_strings.xml
	core/res/res/values-bn-rBD/cm_strings.xml
	core/res/res/values-br-rFR/cm_strings.xml
	core/res/res/values-cs/cm_strings.xml
	core/res/res/values-cy/cm_strings.xml
	core/res/res/values-de/cm_strings.xml
	core/res/res/values-el/cm_strings.xml
	core/res/res/values-en-rAU/cm_strings.xml
	core/res/res/values-en-rGB/cm_strings.xml
	core/res/res/values-en-rIN/cm_strings.xml
	core/res/res/values-en-rPT/cm_strings.xml
	core/res/res/values-eo/cm_strings.xml
	core/res/res/values-es-rMX/cm_strings.xml
	core/res/res/values-es-rUS/cm_strings.xml
	core/res/res/values-es/cm_strings.xml
	core/res/res/values-et-rEE/cm_strings.xml
	core/res/res/values-eu-rES/cm_strings.xml
	core/res/res/values-fa/cm_strings.xml
	core/res/res/values-fi/cm_strings.xml
	core/res/res/values-fil-rPH/cm_strings.xml
	core/res/res/values-fr-rCA/cm_strings.xml
	core/res/res/values-fr/cm_strings.xml
	core/res/res/values-fy-rNL/cm_strings.xml
	core/res/res/values-gd-rGB/cm_strings.xml
	core/res/res/values-gl-rES/cm_strings.xml
	core/res/res/values-gu-rIN/cm_strings.xml
	core/res/res/values-hi/cm_strings.xml
	core/res/res/values-hr/cm_strings.xml
	core/res/res/values-hu/cm_strings.xml
	core/res/res/values-hy-rAM/cm_strings.xml
	core/res/res/values-in/cm_strings.xml
	core/res/res/values-is-rIS/cm_strings.xml
	core/res/res/values-it/cm_strings.xml
	core/res/res/values-ja/cm_strings.xml
	core/res/res/values-ka-rGE/cm_strings.xml
	core/res/res/values-kk-rKZ/cm_strings.xml
	core/res/res/values-km-rKH/cm_strings.xml
	core/res/res/values-kn-rIN/cm_strings.xml
	core/res/res/values-ko/cm_strings.xml
	core/res/res/values-ku/cm_strings.xml
	core/res/res/values-ky-rKG/cm_strings.xml
	core/res/res/values-lb/cm_strings.xml
	core/res/res/values-lo-rLA/cm_strings.xml
	core/res/res/values-lt/cm_strings.xml
	core/res/res/values-lv/cm_strings.xml
	core/res/res/values-mk-rMK/cm_strings.xml
	core/res/res/values-ml-rIN/cm_strings.xml
	core/res/res/values-mn-rMN/cm_strings.xml
	core/res/res/values-mr-rIN/cm_strings.xml
	core/res/res/values-ms-rMY/cm_strings.xml
	core/res/res/values-my-rMM/cm_strings.xml
	core/res/res/values-nb/cm_strings.xml
	core/res/res/values-ne-rNP/cm_strings.xml
	core/res/res/values-oc-rFR/cm_strings.xml
	core/res/res/values-or-rIN/cm_strings.xml
	core/res/res/values-pa-rIN/cm_strings.xml
	core/res/res/values-pl/cm_strings.xml
	core/res/res/values-rm/cm_strings.xml
	core/res/res/values-ro/cm_strings.xml
	core/res/res/values-ru/cm_strings.xml
	core/res/res/values-si-rLK/cm_strings.xml
	core/res/res/values-sk/cm_strings.xml
	core/res/res/values-sl/cm_strings.xml
	core/res/res/values-sq-rAL/cm_strings.xml
	core/res/res/values-sr/cm_strings.xml
	core/res/res/values-sv/cm_strings.xml
	core/res/res/values-sw/cm_strings.xml
	core/res/res/values-ta-rIN/cm_strings.xml
	core/res/res/values-te-rIN/cm_strings.xml
	core/res/res/values-th/cm_strings.xml
	core/res/res/values-tr/cm_strings.xml
	core/res/res/values-ug/cm_strings.xml
	core/res/res/values-uk/cm_strings.xml
	core/res/res/values-ur-rPK/cm_strings.xml
	core/res/res/values-uz-rUZ/cm_strings.xml
	core/res/res/values-vi/cm_strings.xml
	core/res/res/values-zh-rCN/cm_strings.xml
	core/res/res/values-zh-rHK/cm_strings.xml
	core/res/res/values-zh-rTW/cm_strings.xml
	core/res/res/values-zu/cm_strings.xml
	packages/SystemUI/AndroidManifest_cm.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants