コミット: 3779d23fc36ab62fdf694c1a55bb1d47e7f93166 - packages-apps-Settings (git)

packages/apps/Settings

コミットメタ情報

• リビジョン: 3779d23fc36ab62fdf694c1a55bb1d47e7f93166 (tree)
• 日時: 2016-10-07 06:20:36
• 作者: Jaap Jan Meijer <jjmeijer88@gmai...>
• コミッター: Jaap Jan Meijer

ログメッセージ

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

Conflicts:
res/xml/device_info_settings.xml
src/com/android/settings/DeviceInfoSettings.java

変更サマリ

• modified: Android.mk
• modified: AndroidManifest.xml
• modified: proguard.flags
• add: res/drawable-hdpi/data_sweep_left_activated.9.png
• add: res/drawable-hdpi/data_sweep_left_default.9.png
• add: res/drawable-hdpi/data_sweep_right_activated.9.png
• add: res/drawable-hdpi/data_sweep_right_default.9.png
• add: res/drawable-hdpi/folder_lock.png
• add: res/drawable-hdpi/ic_settings_4g.png
• add: res/drawable-hdpi/ic_settings_4g_dis.png
• add: res/drawable-hdpi/ic_settings_call.png
• add: res/drawable-hdpi/ic_settings_mobile_network.png
• add: res/drawable-hdpi/ic_settings_roaming.png
• add: res/drawable-hdpi/ic_settings_system_update.png
• add: res/drawable-hdpi/ic_settings_tethering.png
• add: res/drawable-hdpi/ic_settings_timerswitch.png
• add: res/drawable-mdpi/folder_lock.png
• add: res/drawable-mdpi/ic_settings_4g.png
• add: res/drawable-mdpi/ic_settings_4g_dis.png
• add: res/drawable-mdpi/ic_settings_call.png
• add: res/drawable-mdpi/ic_settings_mobile_network.png
• add: res/drawable-mdpi/ic_settings_roaming.png
• add: res/drawable-mdpi/ic_settings_system_update.png
• add: res/drawable-mdpi/ic_settings_tethering.png
• add: res/drawable-mdpi/ic_settings_timerswitch.png
• add: res/drawable-xhdpi/folder_lock.png
• add: res/drawable-xhdpi/ic_settings_4g.png
• add: res/drawable-xhdpi/ic_settings_4g_dis.png
• add: res/drawable-xhdpi/ic_settings_call.png
• add: res/drawable-xhdpi/ic_settings_mobile_network.png
• add: res/drawable-xhdpi/ic_settings_roaming.png
• add: res/drawable-xhdpi/ic_settings_system_update.png
• add: res/drawable-xhdpi/ic_settings_tethering.png
• add: res/drawable-xhdpi/ic_settings_timerswitch.png
• add: res/drawable-xxhdpi/folder_lock.png
• add: res/drawable-xxhdpi/ic_settings_4g.png
• add: res/drawable-xxhdpi/ic_settings_4g_dis.png
• add: res/drawable-xxhdpi/ic_settings_call.png
• add: res/drawable-xxhdpi/ic_settings_mobile_network.png
• add: res/drawable-xxhdpi/ic_settings_roaming.png
• add: res/drawable-xxhdpi/ic_settings_system_update.png
• add: res/drawable-xxhdpi/ic_settings_tethering.png
• add: res/drawable-xxhdpi/ic_settings_timerswitch.png
• add: res/drawable-xxxhdpi/ic_settings_roaming.png
• add: res/drawable/data_sweep_left.xml
• add: res/drawable/data_sweep_right.xml
• add: res/drawable/ic_fingerprint_dark.xml
• add: res/drawable/ic_launch_app.xml
• add: res/drawable/ic_lockscreen_ime_white.xml
• add: res/drawable/ic_settings_lockscreen.xml
• add: res/drawable/ic_settings_lockscreen_white.xml
• add: res/drawable/ic_settings_profiles.xml
• add: res/drawable/ic_settings_protected.png
• modified: res/drawable/ic_settings_sim.xml
• add: res/drawable/launch_app.xml
• add: res/layout-land/patternlock.xml
• modified: res/layout/app_ops_details_item.xml
• modified: res/layout/crypt_keeper_pattern_entry.xml
• add: res/layout/crypt_keeper_pattern_sizes.xml
• add: res/layout/dashboard_tile_switch.xml
• modified: res/layout/data_usage_chart.xml
• add: res/layout/hidden_apps_list.xml
• add: res/layout/hidden_apps_list_item.xml
• add: res/layout/hotspot_checkbox.xml
• add: res/layout/not_show_again.xml
• add: res/layout/patternlock.xml
• add: res/layout/protected_account_view.xml
• delete: res/layout/setup_wifi_add_network.xml
• modified: res/layout/setup_wifi_layout.xml
• add: res/layout/wfc_checkbox.xml
• modified: res/layout/wifi_dialog.xml
• add: res/menu/appops_manager.xml
• modified: res/menu/data_usage.xml
• modified: res/menu/storage_volume.xml
• modified: res/values-sw360dp/aliases.xml
• modified: res/values-zh-rCN/arrays.xml
• modified: res/values-zh-rCN/strings.xml
• modified: res/values-zh-rHK/arrays.xml
• modified: res/values-zh-rHK/strings.xml
• modified: res/values-zh-rTW/arrays.xml
• modified: res/values-zh-rTW/strings.xml
• modified: res/values/arrays.xml
• modified: res/values/bools.xml
• add: res/values/cm_arrays.xml
• add: res/values/cm_colors.xml
• add: res/values/cm_plurals.xml
• add: res/values/cm_strings.xml
• modified: res/values/config.xml
• add: res/values/customize.xml
• modified: res/values/dimens.xml
• modified: res/values/strings.xml
• modified: res/xml/billing_cycle.xml
• modified: res/xml/data_usage_list.xml
• modified: res/xml/development_prefs.xml
• modified: res/xml/device_info_settings.xml
• modified: res/xml/display_settings.xml
• modified: res/xml/location_settings.xml
• add: res/xml/other_device_functions_settings.xml
• modified: res/xml/other_sound_settings.xml
• modified: res/xml/power_usage_summary.xml
• modified: res/xml/privacy_settings.xml
• modified: res/xml/process_stats_summary.xml
• modified: res/xml/security_settings.xml
• modified: res/xml/security_settings_password_sub.xml
• add: res/xml/security_settings_pattern_size.xml
• modified: res/xml/security_settings_pattern_sub.xml
• modified: res/xml/security_settings_pin_sub.xml
• modified: res/xml/security_settings_slide_sub.xml
• modified: res/xml/tether_prefs.xml
• modified: res/xml/wifi_advanced_settings.xml
• modified: res/xml/wireless_settings.xml
• modified: src/com/android/settings/ApnEditor.java
• modified: src/com/android/settings/ApnPreference.java
• modified: src/com/android/settings/ApnSettings.java
• modified: src/com/android/settings/AppListPreference.java
• modified: src/com/android/settings/ChooseLockGeneric.java
• modified: src/com/android/settings/ChooseLockPattern.java
• add: src/com/android/settings/ChooseLockPatternSize.java
• modified: src/com/android/settings/ConfirmLockPattern.java
• modified: src/com/android/settings/CryptKeeper.java
• modified: src/com/android/settings/DateTimeSettings.java
• modified: src/com/android/settings/DevelopmentSettings.java
• modified: src/com/android/settings/DeviceInfoSettings.java
• modified: src/com/android/settings/DimmableIconPreference.java
• modified: src/com/android/settings/DisplaySettings.java
• add: src/com/android/settings/HotspotPreference.java
• modified: src/com/android/settings/IccLockSettings.java
• add: src/com/android/settings/Lte4GEnabler.java
• modified: src/com/android/settings/MasterClear.java
• add: src/com/android/settings/OtherDeviceFunctionsSettings.java
• modified: src/com/android/settings/PrivacySettings.java
• modified: src/com/android/settings/SecuritySettings.java
• modified: src/com/android/settings/Settings.java
• modified: src/com/android/settings/SettingsActivity.java
• modified: src/com/android/settings/SettingsPreferenceFragment.java
• modified: src/com/android/settings/SubSettings.java
• modified: src/com/android/settings/TetherSettings.java
• modified: src/com/android/settings/Utils.java
• add: src/com/android/settings/WFCPreference.java
• modified: src/com/android/settings/WifiCallingSettings.java
• modified: src/com/android/settings/WirelessSettings.java
• modified: src/com/android/settings/accounts/AccountPreferenceBase.java
• modified: src/com/android/settings/accounts/AccountSettings.java
• modified: src/com/android/settings/accounts/ChooseAccountActivity.java
• modified: src/com/android/settings/accounts/ManageAccountsSettings.java
• modified: src/com/android/settings/applications/AppInfoBase.java
• modified: src/com/android/settings/applications/AppOpsCategory.java
• modified: src/com/android/settings/applications/AppOpsDetails.java
• add: src/com/android/settings/applications/AppOpsDetailsTop.java
• modified: src/com/android/settings/applications/AppOpsState.java
• modified: src/com/android/settings/applications/AppOpsSummary.java
• modified: src/com/android/settings/applications/AppStorageSettings.java
• modified: src/com/android/settings/applications/InstalledAppDetails.java
• add: src/com/android/settings/applications/LockPatternActivity.java
• modified: src/com/android/settings/applications/ProcessStatsSummary.java
• add: src/com/android/settings/applications/ProtectedAppsActivity.java
• modified: src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
• modified: src/com/android/settings/bluetooth/BluetoothPairingDialog.java
• modified: src/com/android/settings/bluetooth/BluetoothPairingRequest.java
• modified: src/com/android/settings/bluetooth/BluetoothSettings.java
• modified: src/com/android/settings/bluetooth/DeviceProfilesSettings.java
• add: src/com/android/settings/cyanogenmod/ProtectedAccountView.java
• add: src/com/android/settings/cyanogenmod/ProtectedAppsReceiver.java
• modified: src/com/android/settings/dashboard/DashboardAdapter.java
• modified: src/com/android/settings/dashboard/DashboardDecorator.java
• modified: src/com/android/settings/dashboard/DashboardSummary.java
• modified: src/com/android/settings/datausage/AppDataUsage.java
• modified: src/com/android/settings/datausage/BillingCycleSettings.java
• modified: src/com/android/settings/datausage/CellDataPreference.java
• add: src/com/android/settings/datausage/ChartDataUsageDeprecatedPreference.java
• modified: src/com/android/settings/datausage/DataUsageList.java
• modified: src/com/android/settings/datausage/DataUsageSummary.java
• modified: src/com/android/settings/datausage/UnrestrictedDataAccess.java
• modified: src/com/android/settings/deviceinfo/ImeiInformation.java
• modified: src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
• modified: src/com/android/settings/deviceinfo/PublicVolumeSettings.java
• modified: src/com/android/settings/deviceinfo/SimStatus.java
• modified: src/com/android/settings/deviceinfo/StorageVolumePreference.java
• modified: src/com/android/settings/deviceinfo/UsbBackend.java
• modified: src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
• modified: src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
• modified: src/com/android/settings/fingerprint/FingerprintUiHelper.java
• modified: src/com/android/settings/fuelgauge/PowerUsageSummary.java
• add: src/com/android/settings/location/DimmableIZatIconPreference.java
• modified: src/com/android/settings/location/LocationSettings.java
• modified: src/com/android/settings/location/SettingsInjector.java
• modified: src/com/android/settings/search/SearchIndexableResources.java
• modified: src/com/android/settings/sim/SimSelectNotification.java
• modified: src/com/android/settings/widget/ChartDataUsageView.java
• modified: src/com/android/settings/widget/ChartNetworkSeriesView.java
• add: src/com/android/settings/widget/InertCheckBox.java
• modified: src/com/android/settings/wifi/AdvancedWifiSettings.java
• modified: src/com/android/settings/wifi/WifiApEnabler.java
• modified: src/com/android/settings/wifi/WifiConfigController.java
• modified: src/com/android/settings/wifi/WifiEnabler.java
• modified: src/com/android/settings/wifi/WifiSettings.java
• modified: src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
• modified: src/com/android/settings/wifi/p2p/WifiP2pSettings.java
• add: src/org/codeaurora/wfcservice/IWFCService.aidl
• add: src/org/codeaurora/wfcservice/IWFCServiceCB.aidl