提交: b573bc8cf16c8816aada8e45d07918adaafb6866 - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修訂: b573bc8cf16c8816aada8e45d07918adaafb6866 (tree)
• 時間: 2017-01-17 00:28:31
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

Change Summary

• modified: AndroidManifest.xml
• modified: assets/contributors.db
• modified: res/values-af/cm_strings.xml
• add: res/values-am/cm_plurals.xml
• modified: res/values-am/cm_strings.xml
• modified: res/values-ar/cm_strings.xml
• modified: res/values-as-rIN/arrays.xml
• modified: res/values-as-rIN/cm_strings.xml
• modified: res/values-as-rIN/strings.xml
• modified: res/values-ast-rES/arrays.xml
• modified: res/values-ast-rES/cm_strings.xml
• modified: res/values-ast-rES/strings.xml
• modified: res/values-az-rAZ/cm_strings.xml
• modified: res/values-be/cm_strings.xml
• modified: res/values-bg/cm_strings.xml
• modified: res/values-bn-rBD/cm_strings.xml
• modified: res/values-br-rFR/arrays.xml
• add: res/values-br-rFR/cm_plurals.xml
• modified: res/values-br-rFR/cm_strings.xml
• modified: res/values-br-rFR/strings.xml
• add: res/values-bs-rBA/cm_plurals.xml
• modified: res/values-bs-rBA/cm_strings.xml
• modified: res/values-ca/cm_strings.xml
• modified: res/values-cs/cm_strings.xml
• modified: res/values-csb-rPL/arrays.xml
• add: res/values-csb-rPL/cm_plurals.xml
• modified: res/values-csb-rPL/cm_strings.xml
• modified: res/values-csb-rPL/strings.xml
• modified: res/values-cy/arrays.xml
• add: res/values-cy/cm_plurals.xml
• modified: res/values-cy/cm_strings.xml
• modified: res/values-cy/strings.xml
• modified: res/values-da/cm_strings.xml
• modified: res/values-de/cm_strings.xml
• modified: res/values-el/cm_strings.xml
• add: res/values-en-rAU/cm_plurals.xml
• modified: res/values-en-rAU/cm_strings.xml
• add: res/values-en-rGB/cm_plurals.xml
• modified: res/values-en-rGB/cm_strings.xml
• modified: res/values-en-rIN/cm_strings.xml
• modified: res/values-en-rPT/arrays.xml
• add: res/values-en-rPT/cm_plurals.xml
• modified: res/values-en-rPT/cm_strings.xml
• modified: res/values-en-rPT/strings.xml
• modified: res/values-eo/arrays.xml
• modified: res/values-eo/cm_plurals.xml
• modified: res/values-eo/cm_strings.xml
• modified: res/values-eo/strings.xml
• modified: res/values-es-rCO/arrays.xml
• add: res/values-es-rCO/cm_plurals.xml
• modified: res/values-es-rCO/cm_strings.xml
• modified: res/values-es-rCO/strings.xml
• modified: res/values-es-rMX/arrays.xml
• add: res/values-es-rMX/cm_plurals.xml
• modified: res/values-es-rMX/cm_strings.xml
• modified: res/values-es-rMX/strings.xml
• modified: res/values-es-rUS/cm_strings.xml
• modified: res/values-es/cm_strings.xml
• modified: res/values-et-rEE/cm_strings.xml
• modified: res/values-eu-rES/cm_strings.xml
• modified: res/values-fa/cm_strings.xml
• modified: res/values-fi/cm_strings.xml
• add: res/values-fil-rPH/cm_plurals.xml
• modified: res/values-fil-rPH/cm_strings.xml
• add: res/values-fr-rCA/cm_plurals.xml
• modified: res/values-fr-rCA/cm_strings.xml
• modified: res/values-fr/cm_strings.xml
• modified: res/values-frp-rIT/arrays.xml
• add: res/values-frp-rIT/cm_plurals.xml
• modified: res/values-frp-rIT/cm_strings.xml
• modified: res/values-frp-rIT/strings.xml
• modified: res/values-fy-rNL/arrays.xml
• add: res/values-fy-rNL/cm_plurals.xml
• modified: res/values-fy-rNL/cm_strings.xml
• modified: res/values-fy-rNL/strings.xml
• modified: res/values-ga-rIE/arrays.xml
• add: res/values-ga-rIE/cm_plurals.xml
• modified: res/values-ga-rIE/cm_strings.xml
• modified: res/values-ga-rIE/strings.xml
• modified: res/values-gd-rGB/arrays.xml
• add: res/values-gd-rGB/cm_plurals.xml
• modified: res/values-gd-rGB/cm_strings.xml
• modified: res/values-gd-rGB/strings.xml
• modified: res/values-gl-rES/cm_strings.xml
• modified: res/values-gu-rIN/cm_strings.xml
• modified: res/values-hi/cm_strings.xml
• modified: res/values-hr/cm_strings.xml
• modified: res/values-hu/cm_strings.xml
• add: res/values-hy-rAM/cm_plurals.xml
• modified: res/values-hy-rAM/cm_strings.xml
• modified: res/values-in/cm_strings.xml
• add: res/values-is-rIS/cm_plurals.xml
• modified: res/values-is-rIS/cm_strings.xml
• modified: res/values-it/cm_strings.xml
• modified: res/values-iw/cm_strings.xml
• modified: res/values-ja/cm_strings.xml
• add: res/values-ka-rGE/cm_plurals.xml
• modified: res/values-ka-rGE/cm_strings.xml
• add: res/values-kk-rKZ/cm_plurals.xml
• modified: res/values-kk-rKZ/cm_strings.xml
• add: res/values-km-rKH/cm_plurals.xml
• modified: res/values-km-rKH/cm_strings.xml
• modified: res/values-kn-rIN/cm_strings.xml
• modified: res/values-ko/cm_strings.xml
• modified: res/values-ku/arrays.xml
• modified: res/values-ku/cm_strings.xml
• modified: res/values-ku/strings.xml
• add: res/values-ky-rKG/cm_plurals.xml
• modified: res/values-ky-rKG/cm_strings.xml
• modified: res/values-lb/arrays.xml
• modified: res/values-lb/cm_strings.xml
• modified: res/values-lb/strings.xml
• add: res/values-lo-rLA/cm_plurals.xml
• modified: res/values-lo-rLA/cm_strings.xml
• modified: res/values-lt/cm_strings.xml
• modified: res/values-lv/cm_strings.xml
• add: res/values-mk-rMK/cm_plurals.xml
• modified: res/values-mk-rMK/cm_strings.xml
• modified: res/values-ml-rIN/cm_strings.xml
• add: res/values-mn-rMN/cm_plurals.xml
• modified: res/values-mn-rMN/cm_strings.xml
• modified: res/values-mr-rIN/cm_strings.xml
• add: res/values-ms-rMY/cm_plurals.xml
• modified: res/values-ms-rMY/cm_strings.xml
• add: res/values-my-rMM/cm_plurals.xml
• modified: res/values-my-rMM/cm_strings.xml
• modified: res/values-nb/cm_strings.xml
• add: res/values-ne-rNP/cm_plurals.xml
• modified: res/values-ne-rNP/cm_strings.xml
• modified: res/values-nl/cm_strings.xml
• modified: res/values-oc-rFR/arrays.xml
• add: res/values-oc-rFR/cm_plurals.xml
• modified: res/values-oc-rFR/cm_strings.xml
• modified: res/values-oc-rFR/strings.xml
• modified: res/values-or-rIN/arrays.xml
• modified: res/values-or-rIN/cm_strings.xml
• modified: res/values-or-rIN/strings.xml
• add: res/values-pa-rIN/cm_plurals.xml
• modified: res/values-pa-rIN/cm_strings.xml
• modified: res/values-pl/cm_strings.xml
• modified: res/values-pt-rBR/cm_strings.xml
• modified: res/values-pt-rPT/cm_strings.xml
• add: res/values-rm/cm_plurals.xml
• modified: res/values-rm/cm_strings.xml
• modified: res/values-ro/cm_strings.xml
• modified: res/values-ru/cm_strings.xml
• modified: res/values-si-rLK/cm_strings.xml
• modified: res/values-sk/cm_plurals.xml
• modified: res/values-sk/cm_strings.xml
• modified: res/values-sl/cm_strings.xml
• add: res/values-sq-rAL/cm_plurals.xml
• modified: res/values-sq-rAL/cm_strings.xml
• modified: res/values-sr/cm_strings.xml
• modified: res/values-sv/cm_strings.xml
• add: res/values-sw/cm_plurals.xml
• modified: res/values-sw/cm_strings.xml
• modified: res/values-ta-rIN/cm_strings.xml
• modified: res/values-te-rIN/cm_strings.xml
• modified: res/values-th/cm_strings.xml
• modified: res/values-tr/cm_strings.xml
• modified: res/values-ug/arrays.xml
• modified: res/values-ug/cm_strings.xml
• modified: res/values-ug/strings.xml
• modified: res/values-uk/cm_strings.xml
• add: res/values-ur-rPK/cm_plurals.xml
• modified: res/values-ur-rPK/cm_strings.xml
• add: res/values-uz-rUZ/cm_plurals.xml
• modified: res/values-uz-rUZ/cm_strings.xml
• modified: res/values-vi/cm_strings.xml
• modified: res/values-zh-rCN/cm_strings.xml
• modified: res/values-zh-rHK/cm_strings.xml
• modified: res/values-zh-rTW/cm_strings.xml
• add: res/values-zu/cm_plurals.xml
• modified: res/values-zu/cm_strings.xml
• modified: res/values/cm_arrays.xml
• modified: res/values/cm_strings.xml
• modified: res/xml/app_notification_settings.xml
• modified: res/xml/status_bar_settings.xml
• modified: res/xml/zen_mode_priority_settings.xml
• modified: src/com/android/settings/ApnSettings.java
• modified: src/com/android/settings/DataUsageUtils.java
• modified: src/com/android/settings/DisplaySettings.java
• modified: src/com/android/settings/SecuritySettings.java
• modified: src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
• modified: src/com/android/settings/notification/AppNotificationSettings.java
• modified: src/com/android/settings/notification/NotificationBackend.java
• modified: src/com/android/settings/notification/ZenModePrioritySettings.java
• modified: src/com/android/settings/notificationlight/ApplicationLightPreference.java
• modified: src/com/android/settings/notificationlight/BatteryLightSettings.java
• modified: src/com/android/settings/notificationlight/LightSettingsDialog.java
• modified: src/com/android/settings/notificationlight/NotificationLightSettings.java