diff options
| -rw-r--r-- | AriesParts/res/values-it/strings.xml | 11 | ||||
| -rw-r--r-- | AriesParts/res/xml/main.xml | 3 | ||||
| -rw-r--r-- | AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java | 10 | ||||
| -rwxr-xr-x | extract-files.sh | 17 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 12 | ||||
| -rw-r--r-- | proprietary-files.txt | 51 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 37 |
7 files changed, 126 insertions, 15 deletions
diff --git a/AriesParts/res/values-it/strings.xml b/AriesParts/res/values-it/strings.xml index c86dee0..7609715 100644 --- a/AriesParts/res/values-it/strings.xml +++ b/AriesParts/res/values-it/strings.xml @@ -25,4 +25,15 @@ <string name="tvout_enable_summary_on">Uscita TV attivata</string> <string name="tvout_system_head">Sistema TV</string> <string name="tvout_system_summary">Imposta il sistema TV per l\' uscita TV</string> + <string name="category_volume_boost_title">Regolazione volume</string> + <string name="volume_boost_title_head">Regolazione volume chiamate</string> + <string name="volume_boost_summary_head">Potenzia il volume delle chiamate</string> + <string name="boost_rcv_title">Volume auricolare</string> + <string name="boost_bt_title">Volume Bluetooth</string> + <string name="boost_spk_title">Volume vivavoce</string> + <string name="boost_hp_title">Volume cuffie</string> + <string name="mic_rcv_title">Microfono auricolare</string> + <string name="mic_spk_title">Microfono vivavoce</string> + <string name="mic_hp_title">Microfono cuffie</string> + <string name="mic_hp_no_mic_title">Microfono cuffie (senza mic.)</string> </resources>
\ No newline at end of file diff --git a/AriesParts/res/xml/main.xml b/AriesParts/res/xml/main.xml index c371a4f..7f88321 100644 --- a/AriesParts/res/xml/main.xml +++ b/AriesParts/res/xml/main.xml @@ -31,7 +31,8 @@ </PreferenceCategory> <PreferenceCategory - android:title="@string/category_radio_title"> + android:title="@string/category_radio_title" + android:key="category_radio"> <!-- UMTS/HSDPA/HSUPA settings --> <ListPreference android:key="hspa" diff --git a/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java index 466feeb..1eb677b 100644 --- a/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ b/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -18,6 +18,7 @@ public class DeviceSettings extends PreferenceActivity { public static final String KEY_MDNIE = "mdnie"; public static final String KEY_BACKLIGHT_TIMEOUT = "backlight_timeout"; public static final String KEY_HSPA = "hspa"; + public static final String KEY_HSPA_CATEGORY = "category_radio"; public static final String KEY_TVOUT_ENABLE = "tvout_enable"; public static final String KEY_TVOUT_SYSTEM = "tvout_system"; public static final String KEY_VOLUME_BOOST = "volume_boost"; @@ -59,8 +60,13 @@ public class DeviceSettings extends PreferenceActivity { mBacklightTimeout.setOnPreferenceChangeListener(new TouchKeyBacklightTimeout()); mHspa = (ListPreference) findPreference(KEY_HSPA); - mHspa.setEnabled(Hspa.isSupported()); - mHspa.setOnPreferenceChangeListener(new Hspa(this)); + if (Hspa.isSupported()) { + mHspa.setOnPreferenceChangeListener(new Hspa(this)); + } else { + PreferenceCategory category = (PreferenceCategory) getPreferenceScreen().findPreference(KEY_HSPA_CATEGORY); + category.removePreference(mHspa); + getPreferenceScreen().removePreference(category); + } mVolumeBoost = (VolumeBoostPreference) findPreference(KEY_VOLUME_BOOST); if (!VolumeBoostPreference.isSupported()) { diff --git a/extract-files.sh b/extract-files.sh new file mode 100755 index 0000000..11ca22d --- /dev/null +++ b/extract-files.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +VENDOR=samsung +DEVICE=aries-common + +BASE=../../../vendor/$VENDOR/$DEVICE/proprietary + +echo "Pulling common files..." +for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do + DIR=`dirname $FILE` + if [ ! -d $BASE/$DIR ]; then + mkdir -p $BASE/$DIR + fi + adb pull /system/$FILE $BASE/$FILE +done + +./setup-makefiles.sh diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 04b1035..54df988 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -203,16 +203,4 @@ <bool name="config_bluetooth_wide_band_speech">false</bool> <bool name="config_ui_enableFadingMarquee">false</bool> - - <!-- Hardware 'face' keys present on the device, stored as a bit field. - This integer should equal the sum of the corresponding value for each - of the following keys present: - 1 - Home - 2 - Back - 4 - Menu - 8 - Search - 16 - App switch - For example, a device with Home, Back and Menu keys would set this - config to 7. --> - <integer name="config_deviceHardwareKeys">7</integer> </resources> diff --git a/proprietary-files.txt b/proprietary-files.txt new file mode 100644 index 0000000..222531c --- /dev/null +++ b/proprietary-files.txt @@ -0,0 +1,51 @@ +vendor/bin/pvrsrvinit +vendor/firmware/bcm4329.hcd +vendor/firmware/nvram_net.txt +vendor/firmware/cypress-touchkey.bin +vendor/firmware/samsung_mfc_fw.bin +lib/egl/libGLES_android.so +vendor/lib/egl/libEGL_POWERVR_SGX540_120.so +vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so +vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so +vendor/lib/hw/gralloc.aries.so +vendor/lib/libakm.so +vendor/lib/libglslcompiler.so +vendor/lib/libIMGegl.so +vendor/lib/libpvr2d.so +vendor/lib/libpvrANDROID_WSEGL.so +vendor/lib/libPVRScopeServices.so +vendor/lib/libsrv_init.so +vendor/lib/libsrv_um.so +vendor/lib/libusc.so +lib/libtvout.so +lib/libtvout_jni.so +lib/lib_tvoutengine.so +lib/libtvoutfimc.so +lib/libtvouthdmi.so +lib/libtvoutservice.so +bin/tvoutserver +bin/charging_mode +bin/playlpm +lib/libQmageDecoder.so +media/battery_charging_10.qmg +media/battery_charging_100.qmg +media/battery_charging_15.qmg +media/battery_charging_20.qmg +media/battery_charging_25.qmg +media/battery_charging_30.qmg +media/battery_charging_35.qmg +media/battery_charging_40.qmg +media/battery_charging_45.qmg +media/battery_charging_5.qmg +media/battery_charging_50.qmg +media/battery_charging_55.qmg +media/battery_charging_60.qmg +media/battery_charging_65.qmg +media/battery_charging_70.qmg +media/battery_charging_75.qmg +media/battery_charging_80.qmg +media/battery_charging_85.qmg +media/battery_charging_90.qmg +media/battery_charging_95.qmg +media/chargingwarning.qmg +media/Disconnected.qmg diff --git a/setup-makefiles.sh b/setup-makefiles.sh new file mode 100755 index 0000000..32768b3 --- /dev/null +++ b/setup-makefiles.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +VENDOR=samsung +DEVICE=aries-common +OUTDIR=vendor/$VENDOR/$DEVICE +MAKEFILE=../../../$OUTDIR/aries-vendor-blobs.mk + +(cat << EOF) > $MAKEFILE +# Copyright (C) 2011 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. + +# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh + +PRODUCT_COPY_FILES += \\ +EOF + +LINEEND=" \\" +COUNT=`cat proprietary-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` +for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do + COUNT=`expr $COUNT - 1` + if [ $COUNT = "0" ]; then + LINEEND="" + fi + echo " $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE +done + |