From b85434c16ffe031270e6c8c62bd26fc46ddce37f Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sat, 13 Apr 2013 12:33:40 +0000 Subject: p31xx: add support for dock audio Change-Id: I35363baf1d0ad4930bee049faf6e8ae25ad94211 --- DeviceSettings/Android.mk | 15 +++ DeviceSettings/AndroidManifest.xml | 31 +++++ .../res/drawable/ic_launcher_cmdevicesettings.png | Bin 0 -> 8207 bytes DeviceSettings/res/layout/top.xml | 5 + DeviceSettings/res/values-de/arrays.xml | 19 +++ DeviceSettings/res/values-de/strings.xml | 24 ++++ DeviceSettings/res/values-es/strings.xml | 24 ++++ DeviceSettings/res/values-fi/strings.xml | 24 ++++ DeviceSettings/res/values-hu/strings.xml | 24 ++++ DeviceSettings/res/values-it/strings.xml | 24 ++++ DeviceSettings/res/values-nl/strings.xml | 24 ++++ DeviceSettings/res/values-pl/arrays.xml | 56 ++++++++ DeviceSettings/res/values-pl/strings.xml | 24 ++++ DeviceSettings/res/values-pt-rBR/strings.xml | 24 ++++ DeviceSettings/res/values-ru/strings.xml | 24 ++++ DeviceSettings/res/values-zh-rCN/strings.xml | 24 ++++ DeviceSettings/res/values/arrays.xml | 19 +++ DeviceSettings/res/values/strings.xml | 24 ++++ DeviceSettings/res/xml/dock_preferences.xml | 26 ++++ .../settings/device/DeviceSettings.java | 142 ++++++++++++++++++++ .../settings/device/DockFragmentActivity.java | 75 +++++++++++ .../com/cyanogenmod/settings/device/Startup.java | 29 +++++ .../src/com/cyanogenmod/settings/device/Utils.java | 143 +++++++++++++++++++++ audio/audio_hw.c | 30 ++++- .../packages/apps/Settings/res/values/config.xml | 3 + .../packages/apps/Trebuchet/res/values/config.xml | 6 - configs/audio_policy.conf | 9 +- configs/tiny_hw.xml | 2 +- p31xx-common.mk | 1 + 29 files changed, 856 insertions(+), 19 deletions(-) create mode 100644 DeviceSettings/Android.mk create mode 100644 DeviceSettings/AndroidManifest.xml create mode 100755 DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png create mode 100755 DeviceSettings/res/layout/top.xml create mode 100644 DeviceSettings/res/values-de/arrays.xml create mode 100644 DeviceSettings/res/values-de/strings.xml create mode 100644 DeviceSettings/res/values-es/strings.xml create mode 100644 DeviceSettings/res/values-fi/strings.xml create mode 100644 DeviceSettings/res/values-hu/strings.xml create mode 100644 DeviceSettings/res/values-it/strings.xml create mode 100644 DeviceSettings/res/values-nl/strings.xml create mode 100644 DeviceSettings/res/values-pl/arrays.xml create mode 100644 DeviceSettings/res/values-pl/strings.xml create mode 100644 DeviceSettings/res/values-pt-rBR/strings.xml create mode 100644 DeviceSettings/res/values-ru/strings.xml create mode 100644 DeviceSettings/res/values-zh-rCN/strings.xml create mode 100644 DeviceSettings/res/values/arrays.xml create mode 100644 DeviceSettings/res/values/strings.xml create mode 100644 DeviceSettings/res/xml/dock_preferences.xml create mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java create mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/DockFragmentActivity.java create mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java create mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/Utils.java delete mode 100644 common-overlay/packages/apps/Trebuchet/res/values/config.xml diff --git a/DeviceSettings/Android.mk b/DeviceSettings/Android.mk new file mode 100644 index 0000000..67ee3a6 --- /dev/null +++ b/DeviceSettings/Android.mk @@ -0,0 +1,15 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := GalaxyTab2Settings +LOCAL_CERTIFICATE := platform + +include $(BUILD_PACKAGE) + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/DeviceSettings/AndroidManifest.xml b/DeviceSettings/AndroidManifest.xml new file mode 100644 index 0000000..a581d10 --- /dev/null +++ b/DeviceSettings/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png b/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png new file mode 100755 index 0000000..66de9c3 Binary files /dev/null and b/DeviceSettings/res/drawable/ic_launcher_cmdevicesettings.png differ diff --git a/DeviceSettings/res/layout/top.xml b/DeviceSettings/res/layout/top.xml new file mode 100755 index 0000000..744b568 --- /dev/null +++ b/DeviceSettings/res/layout/top.xml @@ -0,0 +1,5 @@ + + diff --git a/DeviceSettings/res/values-de/arrays.xml b/DeviceSettings/res/values-de/arrays.xml new file mode 100644 index 0000000..4cf4e23 --- /dev/null +++ b/DeviceSettings/res/values-de/arrays.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/DeviceSettings/res/values-de/strings.xml b/DeviceSettings/res/values-de/strings.xml new file mode 100644 index 0000000..fb16ff2 --- /dev/null +++ b/DeviceSettings/res/values-de/strings.xml @@ -0,0 +1,24 @@ + + + + Galaxy Tab 2 Einstellungen + + Dock + Audio + USB-Dock Audio + Passive Audio-Ausgabe des USB-Docks verwenden + diff --git a/DeviceSettings/res/values-es/strings.xml b/DeviceSettings/res/values-es/strings.xml new file mode 100644 index 0000000..ec13f9d --- /dev/null +++ b/DeviceSettings/res/values-es/strings.xml @@ -0,0 +1,24 @@ + + + + Ajustes Galaxy Tab 2 + + Conector + Audio + Usar el conector de audio USB + Usar la salida de audio pasiva cuando el conector USB esté activado + diff --git a/DeviceSettings/res/values-fi/strings.xml b/DeviceSettings/res/values-fi/strings.xml new file mode 100644 index 0000000..ef3e9d7 --- /dev/null +++ b/DeviceSettings/res/values-fi/strings.xml @@ -0,0 +1,24 @@ + + + + Galaxy Tab 2-asetukset + + Telakka + Audio + Käytä USB-audiotelakkaa + Käytä telakan audioulostuloa + diff --git a/DeviceSettings/res/values-hu/strings.xml b/DeviceSettings/res/values-hu/strings.xml new file mode 100644 index 0000000..cbad81a --- /dev/null +++ b/DeviceSettings/res/values-hu/strings.xml @@ -0,0 +1,24 @@ + + + + Galaxy Tab 2 Beállítások + + Dokkoló + Dokkoló hangszórók + Dokkoló hangszóróinak használata + Használja a dokkoló passzív hangkimenetét + diff --git a/DeviceSettings/res/values-it/strings.xml b/DeviceSettings/res/values-it/strings.xml new file mode 100644 index 0000000..186446b --- /dev/null +++ b/DeviceSettings/res/values-it/strings.xml @@ -0,0 +1,24 @@ + + + + Impostazioni Galaxy Tab 2 + + Dock + Audio + Usa USB audio in dock + Usa l\'uscita audio passiva quando in dock + diff --git a/DeviceSettings/res/values-nl/strings.xml b/DeviceSettings/res/values-nl/strings.xml new file mode 100644 index 0000000..4836a39 --- /dev/null +++ b/DeviceSettings/res/values-nl/strings.xml @@ -0,0 +1,24 @@ + + + + Galaxy Tab 2-instellingen + + Dock + Geluid + USB-geluidsdock + Passieve geluidsuitgang van het dock gebruiken + diff --git a/DeviceSettings/res/values-pl/arrays.xml b/DeviceSettings/res/values-pl/arrays.xml new file mode 100644 index 0000000..268ac03 --- /dev/null +++ b/DeviceSettings/res/values-pl/arrays.xml @@ -0,0 +1,56 @@ + + + + 0% + 25% + 50% (domyślnie) + 75% + 100% + + + + Tylko UMTS + Tylko HSDPA + HSDPA + HSUPA + + + + CyanogenMod (domyślnie) + UI + Wideo + Ciepły film + Zimny film + Kamera + Nawigacja + Galeria + VT + + + + Dynamicznie (domyślnie) + Standardowo + Naturalnie + Film + + + + Normalnie + Odwrócony + + + + Miganie + Zanikanie + + + + Nigdy + 1 sekunda + 2 sekundy + 3 sekundy (domyślnie) + 4 sekundy + 5 sekund + 6 sekund + + + diff --git a/DeviceSettings/res/values-pl/strings.xml b/DeviceSettings/res/values-pl/strings.xml new file mode 100644 index 0000000..5f831ff --- /dev/null +++ b/DeviceSettings/res/values-pl/strings.xml @@ -0,0 +1,24 @@ + + + + Ustawienia Galaxy Tab 2 + + Stacja dokująca + Dźwięk w stacji dokującej + Użyj stacji dokującej + Użyj pasywnego wyjścia audio w stacji dokującej + \ No newline at end of file diff --git a/DeviceSettings/res/values-pt-rBR/strings.xml b/DeviceSettings/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000..d7da292 --- /dev/null +++ b/DeviceSettings/res/values-pt-rBR/strings.xml @@ -0,0 +1,24 @@ + + + + Config. Galaxy Tab 2 + + Dock + Áudio + Usar Áudio USB do Dock + Usar o áudio de saída passivo no dock + diff --git a/DeviceSettings/res/values-ru/strings.xml b/DeviceSettings/res/values-ru/strings.xml new file mode 100644 index 0000000..057df1f --- /dev/null +++ b/DeviceSettings/res/values-ru/strings.xml @@ -0,0 +1,24 @@ + + + + Настройки Galaxy Tab 2 + + Док-станция + Аудио + USB аудио док-станция + Использовать пассивный режим аудио док-станции + diff --git a/DeviceSettings/res/values-zh-rCN/strings.xml b/DeviceSettings/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000..0c5c0e4 --- /dev/null +++ b/DeviceSettings/res/values-zh-rCN/strings.xml @@ -0,0 +1,24 @@ + + + + Galaxy Tab 2 设置 + + 基座 + 基座音频 + 使用基座的 USB 音频 + 使用基座上的被动音频输出 + diff --git a/DeviceSettings/res/values/arrays.xml b/DeviceSettings/res/values/arrays.xml new file mode 100644 index 0000000..4cf4e23 --- /dev/null +++ b/DeviceSettings/res/values/arrays.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml new file mode 100644 index 0000000..5632f1e --- /dev/null +++ b/DeviceSettings/res/values/strings.xml @@ -0,0 +1,24 @@ + + + + Galaxy Tab 2 Settings + + Dock + Dock Audio + Use Dock USB Audio + Use the passive audio out on the dock + diff --git a/DeviceSettings/res/xml/dock_preferences.xml b/DeviceSettings/res/xml/dock_preferences.xml new file mode 100644 index 0000000..62c962c --- /dev/null +++ b/DeviceSettings/res/xml/dock_preferences.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java new file mode 100644 index 0000000..ffa3054 --- /dev/null +++ b/DeviceSettings/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -0,0 +1,142 @@ +/* + * 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. + */ + +package com.cyanogenmod.settings.device; + +import android.app.ActionBar; +import android.app.ActionBar.Tab; +import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentTransaction; +import android.content.Context; +import android.os.Bundle; +import android.support.v4.app.FragmentActivity; +import android.support.v13.app.FragmentPagerAdapter; +import android.support.v4.view.ViewPager; + +import com.cyanogenmod.settings.device.R; + +import java.util.ArrayList; + +public class DeviceSettings extends FragmentActivity { + + public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device"; + public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE"; + public static final String KEY_USE_DOCK_AUDIO = "dock_audio"; + + ViewPager mViewPager; + TabsAdapter mTabsAdapter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mViewPager = new ViewPager(this); + mViewPager.setId(R.id.viewPager); + setContentView(mViewPager); + + final ActionBar bar = getActionBar(); + bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); + bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); + bar.setTitle(R.string.app_name); + + mTabsAdapter = new TabsAdapter(this, mViewPager); + mTabsAdapter.addTab(bar.newTab().setText(R.string.category_dock_title), + DockFragmentActivity.class, null); + + if (savedInstanceState != null) { + bar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0)); + } + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt("tab", getActionBar().getSelectedNavigationIndex()); + } + + public static class TabsAdapter extends FragmentPagerAdapter + implements ActionBar.TabListener, ViewPager.OnPageChangeListener { + private final Context mContext; + private final ActionBar mActionBar; + private final ViewPager mViewPager; + private final ArrayList mTabs = new ArrayList(); + + static final class TabInfo { + private final Class clss; + private final Bundle args; + + TabInfo(Class _class, Bundle _args) { + clss = _class; + args = _args; + } + } + + public TabsAdapter(Activity activity, ViewPager pager) { + super(activity.getFragmentManager()); + mContext = activity; + mActionBar = activity.getActionBar(); + mViewPager = pager; + mViewPager.setAdapter(this); + mViewPager.setOnPageChangeListener(this); + } + + public void addTab(ActionBar.Tab tab, Class clss, Bundle args) { + TabInfo info = new TabInfo(clss, args); + tab.setTag(info); + tab.setTabListener(this); + mTabs.add(info); + mActionBar.addTab(tab); + notifyDataSetChanged(); + } + + @Override + public int getCount() { + return mTabs.size(); + } + + @Override + public Fragment getItem(int position) { + TabInfo info = mTabs.get(position); + return Fragment.instantiate(mContext, info.clss.getName(), info.args); + } + + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + } + + public void onPageSelected(int position) { + mActionBar.setSelectedNavigationItem(position); + } + + public void onPageScrollStateChanged(int state) { + } + + public void onTabSelected(Tab tab, FragmentTransaction ft) { + Object tag = tab.getTag(); + for (int i=0; isup_channel_masks[0] = AUDIO_CHANNEL_OUT_STEREO; out->channel_mask = AUDIO_CHANNEL_OUT_STEREO; if (ladev->outputs[OUTPUT_DEEP_BUF] != NULL) { ret = -ENOSYS; + ALOGW("%s: output not available!", __func__); goto err_open; } output_type = OUTPUT_DEEP_BUF; @@ -2453,8 +2467,10 @@ static int adev_open_output_stream(struct audio_hw_device *dev, RESAMPLER_QUALITY_DEFAULT, NULL, &out->resampler); - if (ret != 0) + if (ret != 0) { + ALOGE("%s: error on resampler create!", __func__); goto err_open; + } out->stream.common.set_sample_rate = out_set_sample_rate; out->stream.common.get_channels = out_get_channels; @@ -2489,6 +2505,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, return 0; err_open: + ALOGE("%s: error opening output stream", __func__); free(out); return ret; } @@ -2783,7 +2800,8 @@ static const struct { { AUDIO_DEVICE_OUT_SPEAKER, "speaker" }, { AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE, "headphone" }, { AUDIO_DEVICE_OUT_EARPIECE, "earpiece" }, - { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "analog-dock" }, + { AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "dock" }, + { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "dock" }, { AUDIO_DEVICE_OUT_ALL_SCO, "sco-out" }, { AUDIO_DEVICE_IN_BUILTIN_MIC, "builtin-mic" }, @@ -2993,7 +3011,7 @@ static int adev_open(const hw_module_t* module, const char* name, hw_device_t** device) { struct espresso_audio_device *adev; - int ret; + int i, ret; if (strcmp(name, AUDIO_HARDWARE_INTERFACE) != 0) return -EINVAL; @@ -3040,6 +3058,10 @@ static int adev_open(const hw_module_t* module, const char* name, adev->in_device = AUDIO_DEVICE_IN_BUILTIN_MIC & ~AUDIO_DEVICE_BIT_IN; select_devices(adev); + for (i = 0; i < OUTPUT_TOTAL; i++) { + adev->outputs[i] = NULL; + } + adev->pcm_modem_dl = NULL; adev->pcm_modem_ul = NULL; adev->pcm_bt_dl = NULL; diff --git a/common-overlay/packages/apps/Settings/res/values/config.xml b/common-overlay/packages/apps/Settings/res/values/config.xml index 8aa3cc2..52e178b 100644 --- a/common-overlay/packages/apps/Settings/res/values/config.xml +++ b/common-overlay/packages/apps/Settings/res/values/config.xml @@ -20,6 +20,9 @@ true + + true + true diff --git a/common-overlay/packages/apps/Trebuchet/res/values/config.xml b/common-overlay/packages/apps/Trebuchet/res/values/config.xml deleted file mode 100644 index 2a65ae4..0000000 --- a/common-overlay/packages/apps/Trebuchet/res/values/config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - true - - - diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf index f483979..72249cf 100644 --- a/configs/audio_policy.conf +++ b/configs/audio_policy.conf @@ -26,7 +26,7 @@ audio_hw_modules { sampling_rates 44100 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO + devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET flags AUDIO_OUTPUT_FLAG_PRIMARY } deep_buffer { @@ -36,13 +36,6 @@ audio_hw_modules { devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER } - hdmi { - sampling_rates 44100|48000 - channel_masks dynamic - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_AUX_DIGITAL - flags AUDIO_OUTPUT_FLAG_DIRECT - } } inputs { primary { diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml index 9a22e4a..49d71ea 100644 --- a/configs/tiny_hw.xml +++ b/configs/tiny_hw.xml @@ -166,7 +166,7 @@ We are able to have most of our routing static so do that - + diff --git a/p31xx-common.mk b/p31xx-common.mk index e40e03d..d5787fb 100755 --- a/p31xx-common.mk +++ b/p31xx-common.mk @@ -74,6 +74,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ audio.primary.piranha \ camera.piranha \ + GalaxyTab2Settings \ hwcomposer.piranha \ lights.piranha \ libinvensense_mpl \ -- cgit v1.1