diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /DeviceSettings/res/xml/audio_preferences.xml | |
parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'DeviceSettings/res/xml/audio_preferences.xml')
-rw-r--r-- | DeviceSettings/res/xml/audio_preferences.xml | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/DeviceSettings/res/xml/audio_preferences.xml b/DeviceSettings/res/xml/audio_preferences.xml deleted file mode 100644 index e6f762e..0000000 --- a/DeviceSettings/res/xml/audio_preferences.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory - android:title="@string/dockaudio_subcat_title"> - <!-- Use Dock Audio --> - <CheckBoxPreference - android:key="dock_audio" - android:title="@string/use_dock_audio_title_head" - android:summary="@string/use_dock_audio_summary_head" - /> - </PreferenceCategory> - - <PreferenceCategory - android:title="@string/incallaudio_subcat_title"> - - <com.cyanogenmod.settings.device.IncallAudio - android:key="incall_tuning" - android:title="@string/incallaudio_subcat_title" - android:dialogTitle="@string/incallaudio_subcat_title" /> - - </PreferenceCategory> - - <PreferenceCategory - android:title="@string/audioout_subcat_title"> - - <com.cyanogenmod.settings.device.AudioOut - android:key="audioout_tuning" - android:title="@string/audioout_subcat_title" - android:dialogTitle="@string/audioout_subcat_title" /> - - </PreferenceCategory> - -</PreferenceScreen> |