diff options
30 files changed, 146 insertions, 948 deletions
@@ -17,16 +17,6 @@ LOCAL_PATH := $(call my-dir) ifeq ($(TARGET_DEVICE),crespo) include $(CLEAR_VARS) -LOCAL_SRC_FILES := s3c-keypad.kcm -LOCAL_MODULE_TAGS := optional -include $(BUILD_KEY_CHAR_MAP) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := cypress-touchkey.kcm -LOCAL_MODULE_TAGS := optional -include $(BUILD_KEY_CHAR_MAP) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := setup_fs.c LOCAL_MODULE := setup_fs LOCAL_MODULE_TAGS := optional diff --git a/BoardConfig.mk b/BoardConfig.mk index 278bf0c..2420efe 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -54,7 +54,7 @@ BOARD_CAMERA_LIBRARIES := libcamera endif BOARD_USES_HGL := true -BOARD_USES_OVERLAY := true +##BOARD_USES_OVERLAY := true DEFAULT_FB_NUM := 2 @@ -80,5 +80,5 @@ WIFI_DRIVER_MODULE_PATH := "/system/modules/bcm4329.ko" WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/fw_bcm4329.bin" WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/fw_bcm4329_apsta.bin" WIFI_DRIVER_MODULE_NAME := "bcm4329" -WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt" +WIFI_DRIVER_MODULE_ARG := "iface_name=wlan0 firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt" diff --git a/cypress-touchkey.kcm b/cypress-touchkey.kcm index 8056364..7ee6e5a 100644 --- a/cypress-touchkey.kcm +++ b/cypress-touchkey.kcm @@ -1,64 +1,15 @@ -[type=QWERTY] - -# keycode display number base caps fn caps_fn - -A 'A' '2' 'a' 'A' '#' 0x00 -B 'B' '2' 'b' 'B' '<' 0x00 -C 'C' '2' 'c' 'C' '9' 0x00E7 -D 'D' '3' 'd' 'D' '5' 0x00 -E 'E' '3' 'e' 'E' '2' 0x0301 -F 'F' '3' 'f' 'F' '6' 0x00A5 -G 'G' '4' 'g' 'G' '-' '_' -H 'H' '4' 'h' 'H' '[' '{' -I 'I' '4' 'i' 'I' '$' 0x0302 -J 'J' '5' 'j' 'J' ']' '}' -K 'K' '5' 'k' 'K' '"' '~' -L 'L' '5' 'l' 'L' ''' '`' -M 'M' '6' 'm' 'M' '!' 0x00 -N 'N' '6' 'n' 'N' '>' 0x0303 -O 'O' '6' 'o' 'O' '(' 0x00 -P 'P' '7' 'p' 'P' ')' 0x00 -Q 'Q' '7' 'q' 'Q' '*' 0x0300 -R 'R' '7' 'r' 'R' '3' 0x20AC -S 'S' '7' 's' 'S' '4' 0x00DF -T 'T' '8' 't' 'T' '+' 0x00A3 -U 'U' '8' 'u' 'U' '&' 0x0308 -V 'V' '8' 'v' 'V' '=' '^' -W 'W' '9' 'w' 'W' '1' 0x00 -X 'X' '9' 'x' 'X' '8' 0xEF00 -Y 'Y' '9' 'y' 'Y' '%' 0x00A1 -Z 'Z' '9' 'z' 'Z' '7' 0x00 - -# on pc keyboards -COMMA ',' ',' ',' ';' ';' '|' -PERIOD '.' '.' '.' ':' ':' 0x2026 -AT '@' '0' '@' '0' '0' 0x2022 -SLASH '/' '/' '/' '?' '?' '\' - -SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01 -ENTER 0xa 0xa 0xa 0xa 0xa 0xa - -TAB 0x9 0x9 0x9 0x9 0x9 0x9 -0 '0' '0' '0' ')' ')' ')' -1 '1' '1' '1' '!' '!' '!' -2 '2' '2' '2' '@' '@' '@' -3 '3' '3' '3' '#' '#' '#' -4 '4' '4' '4' '$' '$' '$' -5 '5' '5' '5' '%' '%' '%' -6 '6' '6' '6' '^' '^' '^' -7 '7' '7' '7' '&' '&' '&' -8 '8' '8' '8' '*' '*' '*' -9 '9' '9' '9' '(' '(' '(' - -GRAVE '`' '`' '`' '~' '`' '~' -MINUS '-' '-' '-' '_' '-' '_' -EQUALS '=' '=' '=' '+' '=' '+' -LEFT_BRACKET '[' '[' '[' '{' '[' '{' -RIGHT_BRACKET ']' ']' ']' '}' ']' '}' -BACKSLASH '\' '\' '\' '|' '\' '|' -SEMICOLON ';' ';' ';' ':' ';' ':' -APOSTROPHE ''' ''' ''' '"' ''' '"' -STAR '*' '*' '*' '*' '*' '*' -POUND '#' '#' '#' '#' '#' '#' -PLUS '+' '+' '+' '+' '+' '+' - +# Copyright (C) 2010 The Android Open Source 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. + +type SPECIAL_FUNCTION diff --git a/cypress-touchkey.kl b/cypress-touchkey.kl index 79d6480..c884476 100644 --- a/cypress-touchkey.kl +++ b/cypress-touchkey.kl @@ -1,3 +1,17 @@ +# Copyright (C) 2010 The Android Open Source 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. + key 139 MENU VIRTUAL key 102 HOME VIRTUAL key 158 BACK VIRTUAL @@ -51,17 +51,16 @@ PRODUCT_COPY_FILES += \ device/samsung/crespo/init.herring.rc:root/init.herring.rc \ device/samsung/crespo/ueventd.herring.rc:root/ueventd.herring.rc -# Prebuilt kl keymaps +# Prebuilt kl and kcm keymaps PRODUCT_COPY_FILES += \ device/samsung/crespo/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl \ + device/samsung/crespo/s3c-keypad.kcm:system/usr/keychars/s3c-keypad.kcm \ + device/samsung/crespo/herring-keypad.kl:system/usr/keylayout/herring-keypad.kl \ + device/samsung/crespo/herring-keypad.kcm:system/usr/keychars/herring-keypad.kcm \ device/samsung/crespo/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \ + device/samsung/crespo/cypress-touchkey.kcm:system/usr/keychars/cypress-touchkey.kcm \ device/samsung/crespo/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ - device/samsung/crespo/herring-keypad.kl:system/usr/keylayout/herring-keypad.kl - -# Generated kcm keymaps -PRODUCT_PACKAGES := \ - s3c-keypad.kcm \ - cypress-touchkey.kcm + device/samsung/crespo/sec_jack.kcm:system/usr/keychars/sec_jack.kcm # Filesystem management tools PRODUCT_PACKAGES += \ @@ -124,9 +123,10 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Note that the only such settings should be the ones that are too low-level to # be reachable from resources or other mechanisms. PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=eth0 \ - wifi.supplicant_scan_interval=15 \ - dalvik.vm.heapsize=32m + wifi.interface=wlan0 \ + wifi.supplicant_scan_interval=15 + +include frameworks/base/build/phone-hdpi-512-dalvik-heap.mk # we have enough storage space to hold precise GC data PRODUCT_TAGS += dalvik.gc.type-precise diff --git a/full_crespo.mk b/full_crespo.mk index aa57db7..3aa53b8 100644 --- a/full_crespo.mk +++ b/full_crespo.mk @@ -37,7 +37,7 @@ PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf. $(call inherit-product-if-exists, vendor/samsung/crespo/full_crespo-trampoline.mk) # Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # This is where we'd set a backup provider if we had one #$(call inherit-product, device/sample/products/backup_overlay.mk) $(call inherit-product, device/samsung/crespo/device.mk) diff --git a/herring-keypad.kcm b/herring-keypad.kcm new file mode 100644 index 0000000..7ee6e5a --- /dev/null +++ b/herring-keypad.kcm @@ -0,0 +1,15 @@ +# Copyright (C) 2010 The Android Open Source 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. + +type SPECIAL_FUNCTION diff --git a/herring-keypad.kl b/herring-keypad.kl index 8720050..320a340 100644 --- a/herring-keypad.kl +++ b/herring-keypad.kl @@ -1,7 +1,17 @@ -key 115 VOLUME_UP WAKE -key 114 VOLUME_DOWN WAKE -key 116 POWER WAKE -key 139 MENU VIRTUAL -key 102 HOME VIRTUAL -key 158 BACK VIRTUAL -key 217 SEARCH VIRTUAL +# Copyright (C) 2010 The Android Open Source 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. + +114 VOLUME_DOWN WAKE +115 VOLUME_UP WAKE +116 POWER WAKE diff --git a/init.herring.rc b/init.herring.rc index 7d52527..3105d79 100755 --- a/init.herring.rc +++ b/init.herring.rc @@ -75,8 +75,8 @@ service pvrsrvinit /system/vendor/bin/pvrsrvinit group root oneshot -service wpa_supplicant /system/bin/wpa_supplicant -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf - socket wpa_eth0 dgram 0660 wifi wifi +service wpa_supplicant /system/bin/wpa_supplicant -Dwext -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf + socket wpa_wlan0 dgram 0660 wifi wifi disabled oneshot diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp index 99c38fa..e5c1e60 100644 --- a/libaudio/AudioHardware.cpp +++ b/libaudio/AudioHardware.cpp @@ -76,7 +76,6 @@ enum { const char *AudioHardware::inputPathNameDefault = "Default"; const char *AudioHardware::inputPathNameCamcorder = "Camcorder"; const char *AudioHardware::inputPathNameVoiceRecognition = "Voice Recognition"; -const char *AudioHardware::inputPathNameVoiceCommunication = "Voice Communication"; AudioHardware::AudioHardware() : mInit(false), @@ -948,11 +947,9 @@ status_t AudioHardware::setInputSource_l(audio_source source) const char* sourceName; switch (source) { case AUDIO_SOURCE_DEFAULT: // intended fall-through - case AUDIO_SOURCE_MIC: - sourceName = inputPathNameDefault; - break; + case AUDIO_SOURCE_MIC: // intended fall-through case AUDIO_SOURCE_VOICE_COMMUNICATION: - sourceName = inputPathNameVoiceCommunication; + sourceName = inputPathNameDefault; break; case AUDIO_SOURCE_CAMCORDER: sourceName = inputPathNameCamcorder; diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h index a23e6c9..c7da999 100644 --- a/libaudio/AudioHardware.h +++ b/libaudio/AudioHardware.h @@ -78,7 +78,6 @@ public: static const char *inputPathNameDefault; static const char *inputPathNameCamcorder; static const char *inputPathNameVoiceRecognition; - static const char *inputPathNameVoiceCommunication; AudioHardware(); virtual ~AudioHardware(); diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 50d43a0..fcd8390 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -366,6 +366,11 @@ CameraHardwareSec::~CameraHardwareSec() singleton.clear(); } +status_t CameraHardwareSec::setPreviewWindow(const sp<ANativeWindow>& buf) +{ + return NO_ERROR; +} + sp<IMemoryHeap> CameraHardwareSec::getPreviewHeap() const { return mPreviewHeap; diff --git a/libcamera/SecCameraHWInterface.h b/libcamera/SecCameraHWInterface.h index 75526c6..e309ae5 100644 --- a/libcamera/SecCameraHWInterface.h +++ b/libcamera/SecCameraHWInterface.h @@ -63,6 +63,7 @@ public: virtual CameraParameters getParameters() const; virtual status_t sendCommand(int32_t command, int32_t arg1, int32_t arg2); + virtual status_t setPreviewWindow(const sp<ANativeWindow>& buf); virtual void release(); static sp<CameraHardwareInterface> createInstance(int cameraId); diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 172fd9d..4567f55 100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -4,8 +4,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - stagefright_overlay_output.cpp \ - SecHardwareRenderer.cpp \ SEC_OMX_Plugin.cpp LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY) @@ -13,7 +11,6 @@ LOCAL_CFLAGS += $(PV_CFLAGS_MINUS_VISIBILITY) LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../liboverlay LOCAL_SHARED_LIBRARIES := \ libbinder \ diff --git a/libstagefrighthw/SecHardwareRenderer.cpp b/libstagefrighthw/SecHardwareRenderer.cpp deleted file mode 100644 index cb9e8e8..0000000 --- a/libstagefrighthw/SecHardwareRenderer.cpp +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source 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. - */ - -#define LOG_TAG "SecHardwareRenderer" -#define LOG_NDEBUG 0 -#include <utils/Log.h> - -#include "SecHardwareRenderer.h" - -#include <media/stagefright/MediaDebug.h> -#include <surfaceflinger/ISurface.h> -#include <ui/Overlay.h> - -#include <hardware/hardware.h> - -#include "v4l2_utils.h" -#include "utils/Timers.h" - -#define CACHEABLE_BUFFERS 0x1 - -#define USE_ZERO_COPY -//#define SEC_DEBUG - -namespace android { - -//////////////////////////////////////////////////////////////////////////////// - -SecHardwareRenderer::SecHardwareRenderer( - const sp<ISurface> &surface, - size_t displayWidth, size_t displayHeight, - size_t decodedWidth, size_t decodedHeight, - OMX_COLOR_FORMATTYPE colorFormat, - int32_t rotationDegrees, - bool fromHardwareDecoder) - : mISurface(surface), - mDisplayWidth(displayWidth), - mDisplayHeight(displayHeight), - mDecodedWidth(decodedWidth), - mDecodedHeight(decodedHeight), - mColorFormat(colorFormat), - mInitCheck(NO_INIT), - mFrameSize(mDecodedWidth * mDecodedHeight * 2), - mIsFirstFrame(true), - mCustomFormat(false), - mIndex(0) { - - CHECK(mISurface.get() != NULL); - CHECK(mDecodedWidth > 0); - CHECK(mDecodedHeight > 0); - - if (colorFormat != OMX_COLOR_FormatCbYCrY - && colorFormat != OMX_COLOR_FormatYUV420Planar - && colorFormat != OMX_COLOR_FormatYUV420SemiPlanar) { - LOGE("Invalid colorFormat (0x%x)", colorFormat); - return; - } - - uint32_t orientation; - switch (rotationDegrees) { - case 0: orientation = ISurface::BufferHeap::ROT_0; break; - case 90: orientation = ISurface::BufferHeap::ROT_90; break; - case 180: orientation = ISurface::BufferHeap::ROT_180; break; - case 270: orientation = ISurface::BufferHeap::ROT_270; break; - default: orientation = ISurface::BufferHeap::ROT_0; break; - } - - sp<OverlayRef> ref; - -#if defined (USE_ZERO_COPY) - if (fromHardwareDecoder) { - ref = mISurface->createOverlay( - mDecodedWidth, mDecodedHeight, - HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP, orientation); - mCustomFormat = true; - } -#else - else - { - ref = mISurface->createOverlay( - mDecodedWidth, mDecodedHeight, HAL_PIXEL_FORMAT_YCbCr_420_P, - orientation); - } -#endif - - if (ref.get() == NULL) { - LOGE("Unable to create the overlay!"); - return; - } - - mOverlay = new Overlay(ref); - mOverlay->setParameter(CACHEABLE_BUFFERS, 0); - - mNumBuf = mOverlay->getBufferCount(); - - if (mCustomFormat) { - mFrameSize = 32; - mMemoryHeap = new MemoryHeapBase(mNumBuf * mFrameSize); - } else { - for (size_t i = 0; i < (size_t)mNumBuf; ++i) { - void *addr = mOverlay->getBufferAddress((void *)i); - mOverlayAddresses.push(addr); - } - } - - mInitCheck = OK; -} - -SecHardwareRenderer::~SecHardwareRenderer() { - - if(mMemoryHeap != NULL) - mMemoryHeap.clear(); - - if (mOverlay.get() != NULL) { - mOverlay->destroy(); - mOverlay.clear(); - } -} - -void SecHardwareRenderer::handleYUV420Planar( - const void *data, size_t size) { - - int FrameSize; - uint8_t* pPhyYAddr; - uint8_t* pPhyCAddr; - int AddrSize; - size_t offset; - - CHECK(size >= (mDecodedWidth * mDecodedHeight * 3) / 2); - - offset = mIndex * mFrameSize; - void *dst = (uint8_t *)mMemoryHeap->getBase() + offset; - - AddrSize = sizeof(void *); - memcpy(&FrameSize, data, sizeof(FrameSize)); - memcpy(&pPhyYAddr, data + sizeof(FrameSize), sizeof(pPhyYAddr)); - memcpy(&pPhyCAddr, data + sizeof(FrameSize) + (AddrSize * 1), sizeof(pPhyCAddr)); - - memcpy(dst , &pPhyYAddr, sizeof(pPhyYAddr)); - memcpy(dst + sizeof(pPhyYAddr) , &pPhyCAddr, sizeof(pPhyCAddr)); - memcpy(dst + sizeof(pPhyYAddr) + sizeof(pPhyCAddr), &mIndex, sizeof(mIndex)); -} - -void SecHardwareRenderer::render( - const void *data, size_t size, void *platformPrivate) { - - if (mOverlay.get() == NULL) { - return; - } - - if (mCustomFormat) { - /* zero copy solution case */ - - overlay_buffer_t dst = (uint8_t *)mMemoryHeap->getBase() + mIndex*mFrameSize; - - if (mColorFormat == OMX_COLOR_FormatYUV420Planar || - mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) { - handleYUV420Planar(data, size); - } - - if (mOverlay->queueBuffer(dst) == ALL_BUFFERS_FLUSHED) { - mIsFirstFrame = true; - if (mOverlay->queueBuffer((void *)dst) != 0) { - return; - } - } - - if (++mIndex == mNumBuf) { - mIndex = 0; - } - - overlay_buffer_t overlay_buffer; - if (!mIsFirstFrame) { - status_t err = mOverlay->dequeueBuffer(&overlay_buffer); - if (err == ALL_BUFFERS_FLUSHED) { - mIsFirstFrame = true; - } else { - return; - } - } else { - mIsFirstFrame = false; - } - } else { - /* normal frame case */ - if (mColorFormat == OMX_COLOR_FormatYUV420Planar) { - memcpy(mOverlayAddresses[mIndex], data, size); - } - - if (mOverlay->queueBuffer((void *)mIndex) == ALL_BUFFERS_FLUSHED) { - mIsFirstFrame = true; - if (mOverlay->queueBuffer((void *)mIndex) != 0) { - return; - } - } - - if (++mIndex == mNumBuf) { - mIndex = 0; - } - - overlay_buffer_t overlay_buffer; - if (!mIsFirstFrame) { - status_t err = mOverlay->dequeueBuffer(&overlay_buffer); - - if (err == ALL_BUFFERS_FLUSHED) { - mIsFirstFrame = true; - } else { - return; - } - } else { - mIsFirstFrame = false; - } - } -} - -} // namespace android - diff --git a/libstagefrighthw/SecHardwareRenderer.h b/libstagefrighthw/SecHardwareRenderer.h deleted file mode 100644 index 3fad243..0000000 --- a/libstagefrighthw/SecHardwareRenderer.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source 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. - */ - -#ifndef SEC_HARDWARE_RENDERER_H_ - -#define SEC_HARDWARE_RENDERER_H_ - -#include <media/stagefright/VideoRenderer.h> -#include <utils/RefBase.h> -#include <utils/Vector.h> - -#include <OMX_Component.h> - -#include <binder/MemoryHeapBase.h> -#include <binder/MemoryHeapPmem.h> - -namespace android { - -class ISurface; -class Overlay; - -class SecHardwareRenderer : public VideoRenderer { -public: - SecHardwareRenderer( - const sp<ISurface> &surface, - size_t displayWidth, size_t displayHeight, - size_t decodedWidth, size_t decodedHeight, - OMX_COLOR_FORMATTYPE colorFormat, - int32_t rotationDegrees, - bool fromHardwareDecoder); - - virtual ~SecHardwareRenderer(); - - status_t initCheck() const { return mInitCheck; } - - virtual void render( - const void *data, size_t size, void *platformPrivate); - - -private: - sp<ISurface> mISurface; - size_t mDisplayWidth, mDisplayHeight; - size_t mDecodedWidth, mDecodedHeight; - OMX_COLOR_FORMATTYPE mColorFormat; - status_t mInitCheck; - size_t mFrameSize; - sp<Overlay> mOverlay; - sp<MemoryHeapBase> mMemoryHeap; - Vector<void *> mOverlayAddresses; - bool mIsFirstFrame; - int mNumBuf; - size_t mIndex; - bool mCustomFormat; - - - SecHardwareRenderer(const SecHardwareRenderer &); - SecHardwareRenderer &operator=(const SecHardwareRenderer &); - - void handleYUV420Planar(const void *, size_t); -}; - -} // namespace android - -#endif // SEC_HARDWARE_RENDERER_H_ - diff --git a/libstagefrighthw/stagefright_overlay_output.cpp b/libstagefrighthw/stagefright_overlay_output.cpp deleted file mode 100644 index fce1d7e..0000000 --- a/libstagefrighthw/stagefright_overlay_output.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source 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. - */ - -#include "SecHardwareRenderer.h" - -#include <media/stagefright/HardwareAPI.h> - -using android::sp; -using android::ISurface; -using android::VideoRenderer; - -VideoRenderer *createRendererWithRotation( - const sp<ISurface> &surface, - const char *componentName, - OMX_COLOR_FORMATTYPE colorFormat, - size_t displayWidth, size_t displayHeight, - size_t decodedWidth, size_t decodedHeight, - int32_t rotationDegrees) { - using android::SecHardwareRenderer; - - bool fromHardwareDecoder = !strncmp(componentName, "OMX.SEC.", 8); - - SecHardwareRenderer *renderer = - new SecHardwareRenderer( - surface, displayWidth, displayHeight, - decodedWidth, decodedHeight, - colorFormat, - rotationDegrees, - fromHardwareDecoder); - - if (renderer->initCheck() != android::OK) { - delete renderer; - renderer = NULL; - } - - return renderer; -} - diff --git a/mxt224_ts_input.idc b/mxt224_ts_input.idc index f754999..d258f04 100644 --- a/mxt224_ts_input.idc +++ b/mxt224_ts_input.idc @@ -20,6 +20,10 @@ # Refer to the input device calibration documentation for more details. # +# Basic Parameters +touch.deviceType = touchScreen +touch.orientationAware = 1 + # Touch Size touch.touchSize.calibration = pressure diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg Binary files differdeleted file mode 100644 index f4a3934..0000000 --- a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle.jpg +++ /dev/null diff --git a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg b/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg Binary files differdeleted file mode 100644 index d580182..0000000 --- a/overlay/packages/apps/Launcher2/res/drawable-hdpi/wallpaper_shuttle_small.jpg +++ /dev/null diff --git a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml index 40033cf..6d3ec8d 100644 --- a/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml +++ b/overlay/packages/apps/Launcher2/res/values-hdpi/wallpapers.xml @@ -31,6 +31,5 @@ <item>wallpaper_mountains</item> <item>wallpaper_sunset</item> <item>wallpaper_goldengate</item> - <item>wallpaper_shuttle</item> </string-array> </resources> diff --git a/overlay/packages/wallpapers/Basic/res/drawable-hdpi/nexus_thumb.png b/overlay/packages/wallpapers/Basic/res/drawable-hdpi/nexus_thumb.png Binary files differdeleted file mode 100644 index 84462e2..0000000 --- a/overlay/packages/wallpapers/Basic/res/drawable-hdpi/nexus_thumb.png +++ /dev/null diff --git a/overlay/packages/wallpapers/Basic/res/drawable-hdpi/pyramid_background.png b/overlay/packages/wallpapers/Basic/res/drawable-hdpi/pyramid_background.png Binary files differdeleted file mode 100644 index 2310a91..0000000 --- a/overlay/packages/wallpapers/Basic/res/drawable-hdpi/pyramid_background.png +++ /dev/null diff --git a/overlay/packages/wallpapers/Basic/res/raw/nexus.rs b/overlay/packages/wallpapers/Basic/res/raw/nexus.rs deleted file mode 100644 index df79689..0000000 --- a/overlay/packages/wallpapers/Basic/res/raw/nexus.rs +++ /dev/null @@ -1,313 +0,0 @@ -// Copyright (C) 2009 The Android Open Source 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. - -#pragma version(1) -#pragma stateVertex(PVOrtho) -#pragma stateStore(PSSolid) - -#define MAX_PULSES 20 -#define MAX_EXTRAS 40 -#define PULSE_SIZE 14 // Size in pixels of a cell -#define HALF_PULSE_SIZE 7 -#define GLOW_SIZE 64 // Size of the leading glow in pixels -#define HALF_GLOW_SIZE 32 -#define SPEED 0.2f // (200 / 1000) Pixels per ms -#define SPEED_VARIANCE 0.3f -#define PULSE_NORMAL 0 -#define PULSE_EXTRA 1 -#define TRAIL_SIZE 40 // Number of cells in a trail -#define MAX_DELAY 2000 // Delay between a pulse going offscreen and restarting - -struct pulse_s { - int pulseType; - float originX; - float originY; - int color; - int startTime; - float dx; - float dy; - float scale; - int active; -}; -struct pulse_s gPulses[MAX_PULSES]; - -struct pulse_s gExtras[MAX_EXTRAS]; - -int gNow; - - -void setColor(int c) { - if (State->mode == 1) { - // sholes red - color(0.9f, 0.1f, 0.1f, 0.8f); - } else if (c == 0) { - // red - color(1.0f, 0.0f, 0.0f, 0.8f); - } else if (c == 1) { - // green - color(0.0f, 0.8f, 0.0f, 0.8f); - } else if (c == 2) { - // blue - color(0.0f, 0.4f, 0.9f, 0.8f); - } else if (c == 3) { - // yellow - color(1.0f, 0.8f, 0.0f, 0.8f); - } -} - -void initPulse(struct pulse_s * pulse, int pulseType) { - float scale = randf2(0.7f, 1.7f); - pulse->scale = scale; - if (randf(1) > 0.5f) { - pulse->originX = (int)randf(State->width * 2 / PULSE_SIZE) * PULSE_SIZE; - pulse->dx = 0; - if (randf(1) > 0.5f) { - // Top - pulse->originY = 0; - pulse->dy = scale; - } else { - // Bottom - pulse->originY = State->height / scale; - pulse->dy = -scale; - } - } else { - pulse->originY = (int)randf(State->height / PULSE_SIZE) * PULSE_SIZE; - pulse->dy = 0; - if (randf(1) > 0.5f) { - // Left - pulse->originX = 0; - pulse->dx = scale; - } else { - // Right - pulse->originX = State->width * 2 / scale; - pulse->dx = -scale; - } - } - pulse->startTime = gNow + (int)randf(MAX_DELAY); - - pulse->color = (int)randf(4.0f); - - pulse->pulseType = pulseType; - if (pulseType == PULSE_EXTRA) { - pulse->active = 0; - } else { - pulse->active = 1; - } -} - -void initPulses() { - gNow = uptimeMillis(); - int i; - for (i=0; i<MAX_PULSES; i++) { - initPulse(&gPulses[i], PULSE_NORMAL); - } - for (i=0; i<MAX_EXTRAS; i++) { - struct pulse_s * p = &gExtras[i]; - p->pulseType = PULSE_EXTRA; - p->active = 0; - } -} - -void drawBackground(int width, int height) { - bindProgramFragment(NAMED_PFTextureBG); - bindTexture(NAMED_PFTextureBG, 0, NAMED_TBackground); - color(1.0f, 1.0f, 1.0f, 1.0f); - if (State->rotate) { - drawRect(0.0f, 0.0f, height*2, width, 0.0f); - } else { - drawRect(0.0f, 0.0f, width*2, height, 0.0f); - } -} - -void drawPulses(struct pulse_s * pulseSet, int setSize) { - bindProgramFragment(NAMED_PFTexture); - bindProgramFragmentStore(NAMED_PSBlend); - - float matrix[16]; - float modelMatrix[16]; - - int i; - for (i=0; i<setSize; i++) { - struct pulse_s * p = &pulseSet[i]; - - int delta = gNow - p->startTime; - - if (p->active != 0 && delta >= 0) { - - matrixLoadIdentity(modelMatrix); - if (State->rotate) { - //matrixLoadRotate(modelMatrix, 90.0f, 0.0f, 0.0f, 1.0f); - //matrixTranslate(modelMatrix, 0.0f, -height, 1.0f); - // XXX: HAX: do not slide display in landscape - } else { - matrixTranslate(modelMatrix, -(State->xOffset * State->width), 0, 0); - } - matrixScale(modelMatrix, p->scale, p->scale, 1.0f); - vpLoadModelMatrix(modelMatrix); - - float x = p->originX + (p->dx * SPEED * delta); - float y = p->originY + (p->dy * SPEED * delta); - - matrixLoadIdentity(matrix); - if (p->dx < 0) { - vpLoadTextureMatrix(matrix); - float xx = x + (TRAIL_SIZE * PULSE_SIZE); - if (xx <= 0) { - initPulse(p, p->pulseType); - } else { - setColor(p->color); - bindTexture(NAMED_PFTexture, 0, NAMED_TPulse); - drawRect(x, y, xx, y + PULSE_SIZE, 0.0f); - bindTexture(NAMED_PFTexture, 0, NAMED_TGlow); - drawRect(x + HALF_PULSE_SIZE - HALF_GLOW_SIZE, - y + HALF_PULSE_SIZE - HALF_GLOW_SIZE, - x + HALF_PULSE_SIZE + HALF_GLOW_SIZE, - y + HALF_PULSE_SIZE + HALF_GLOW_SIZE, - 0.0f); - } - } else if (p->dx > 0) { - x += PULSE_SIZE; // need to start on the other side of this cell - vpLoadTextureMatrix(matrix); - float xx = x - (TRAIL_SIZE * PULSE_SIZE); - if (xx >= State->width * 2) { - initPulse(p, p->pulseType); - } else { - setColor(p->color); - bindTexture(NAMED_PFTexture, 0, NAMED_TPulse); - drawRect(x, y, xx, y + PULSE_SIZE, 0.0f); - bindTexture(NAMED_PFTexture, 0, NAMED_TGlow); - drawRect(x - HALF_PULSE_SIZE - HALF_GLOW_SIZE, - y + HALF_PULSE_SIZE - HALF_GLOW_SIZE, - x - HALF_PULSE_SIZE + HALF_GLOW_SIZE, - y + HALF_PULSE_SIZE + HALF_GLOW_SIZE, - 0.0f); - } - } else if (p->dy < 0) { - vpLoadTextureMatrix(matrix); - float yy = y + (TRAIL_SIZE * PULSE_SIZE); - if (yy <= 0) { - initPulse(p, p->pulseType); - } else { - setColor(p->color); - bindTexture(NAMED_PFTexture, 0, NAMED_TPulseVert); - drawRect(x, yy, x + PULSE_SIZE, y, 0.0f); - bindTexture(NAMED_PFTexture, 0, NAMED_TGlow); - drawRect(x + HALF_PULSE_SIZE - HALF_GLOW_SIZE, - y + HALF_PULSE_SIZE - HALF_GLOW_SIZE, - x + HALF_PULSE_SIZE + HALF_GLOW_SIZE, - y + HALF_PULSE_SIZE + HALF_GLOW_SIZE, - 0.0f); - } - } else if (p->dy > 0) { - y += PULSE_SIZE; // need to start on the other side of this cell - vpLoadTextureMatrix(matrix); - float yy = y - (TRAIL_SIZE * PULSE_SIZE); - if (yy >= State->height) { - initPulse(p, p->pulseType); - } else { - setColor(p->color); - bindTexture(NAMED_PFTexture, 0, NAMED_TPulseVert); - drawRect(x, yy, x + PULSE_SIZE, y, 0.0f); - bindTexture(NAMED_PFTexture, 0, NAMED_TGlow); - drawRect(x + HALF_PULSE_SIZE - HALF_GLOW_SIZE, - y - HALF_PULSE_SIZE - HALF_GLOW_SIZE, - x + HALF_PULSE_SIZE + HALF_GLOW_SIZE, - y - HALF_PULSE_SIZE + HALF_GLOW_SIZE, - 0.0f); - } - } - } - } - - - matrixLoadIdentity(matrix); - vpLoadTextureMatrix(matrix); -} - -void addTap(int x, int y) { - int i; - int count = 0; - int color = (int)randf(4.0f); - float scale = randf2(0.9f, 1.9f); - x = (int)(x / PULSE_SIZE) * PULSE_SIZE; - y = (int)(y / PULSE_SIZE) * PULSE_SIZE; - for (i=0; i<MAX_EXTRAS; i++) { - struct pulse_s * p = &gExtras[i]; - if (p->active == 0) { - p->originX = x/scale; - p->originY = y/scale; - p->scale = scale; - - if (count == 0) { - p->dx = scale; - p->dy = 0.0f; - } else if (count == 1) { - p->dx = -scale; - p->dy = 0.0f; - } else if (count == 2) { - p->dx = 0.0f; - p->dy = scale; - } else if (count == 3) { - p->dx = 0.0f; - p->dy = -scale; - } - - p->active = 1; - p->color = color; - color++; - if (color >= 4) { - color = 0; - } - p->startTime = gNow; - count++; - if (count == 4) { - break; - } - } - } -} - -int main(int index) { - - gNow = uptimeMillis(); - - if (Command->command != 0) { - //debugF("x", Command->x); - //debugF("y", Command->y); - Command->command = 0; - addTap(Command->x, Command->y); - } - - int width = State->width; - int height = State->height; - - float matrix[16]; - matrixLoadIdentity(matrix); - if (State->rotate) { - //matrixLoadRotate(matrix, 90.0f, 0.0f, 0.0f, 1.0f); - //matrixTranslate(matrix, 0.0f, -height, 1.0f); - // XXX: HAX: do not slide display in landscape - } else { - matrixTranslate(matrix, -(State->xOffset * width), 0, 0); - } - - vpLoadModelMatrix(matrix); - - drawBackground(width, height); - - drawPulses(gPulses, MAX_PULSES); - drawPulses(gExtras, MAX_EXTRAS); - - return 45; -} diff --git a/overlay/packages/wallpapers/Basic/res/values/surfacemode.xml b/overlay/packages/wallpapers/Basic/res/values/surfacemode.xml deleted file mode 100644 index 37774ed..0000000 --- a/overlay/packages/wallpapers/Basic/res/values/surfacemode.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source 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. ---> -<resources> - <bool name="use_32bit">true</bool> -</resources> diff --git a/qwerty.kl b/qwerty.kl deleted file mode 100644 index 0b1ea74..0000000 --- a/qwerty.kl +++ /dev/null @@ -1,90 +0,0 @@ -key 399 GRAVE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 1 BACK WAKE_DROPPED -key 158 BACK WAKE_DROPPED -key 230 SOFT_RIGHT WAKE -key 60 SOFT_RIGHT WAKE -key 107 ENDCALL WAKE_DROPPED -key 62 ENDCALL WAKE_DROPPED -key 229 MENU WAKE_DROPPED -key 139 MENU WAKE_DROPPED -key 59 MENU WAKE_DROPPED -key 127 SEARCH WAKE_DROPPED -key 217 SEARCH WAKE_DROPPED -key 228 POUND -key 227 STAR -key 231 CALL WAKE_DROPPED -key 61 CALL WAKE_DROPPED -key 232 DPAD_CENTER WAKE_DROPPED -key 108 DPAD_DOWN WAKE_DROPPED -key 103 DPAD_UP WAKE_DROPPED -key 102 HOME WAKE -key 105 DPAD_LEFT WAKE_DROPPED -key 106 DPAD_RIGHT WAKE_DROPPED -key 115 VOLUME_UP WAKE -key 114 VOLUME_DOWN WAKE -key 116 POWER WAKE -key 212 CAMERA - -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 43 BACKSLASH - -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 14 DEL - -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 28 ENTER - -key 56 ALT_LEFT -key 100 ALT_RIGHT -key 42 SHIFT_LEFT -key 54 SHIFT_RIGHT -key 15 TAB -key 57 SPACE -key 150 EXPLORER -key 155 ENVELOPE - -key 12 MINUS -key 13 EQUALS -key 215 AT - - diff --git a/s3c-keypad.kcm b/s3c-keypad.kcm index 8056364..7ee6e5a 100644 --- a/s3c-keypad.kcm +++ b/s3c-keypad.kcm @@ -1,64 +1,15 @@ -[type=QWERTY] - -# keycode display number base caps fn caps_fn - -A 'A' '2' 'a' 'A' '#' 0x00 -B 'B' '2' 'b' 'B' '<' 0x00 -C 'C' '2' 'c' 'C' '9' 0x00E7 -D 'D' '3' 'd' 'D' '5' 0x00 -E 'E' '3' 'e' 'E' '2' 0x0301 -F 'F' '3' 'f' 'F' '6' 0x00A5 -G 'G' '4' 'g' 'G' '-' '_' -H 'H' '4' 'h' 'H' '[' '{' -I 'I' '4' 'i' 'I' '$' 0x0302 -J 'J' '5' 'j' 'J' ']' '}' -K 'K' '5' 'k' 'K' '"' '~' -L 'L' '5' 'l' 'L' ''' '`' -M 'M' '6' 'm' 'M' '!' 0x00 -N 'N' '6' 'n' 'N' '>' 0x0303 -O 'O' '6' 'o' 'O' '(' 0x00 -P 'P' '7' 'p' 'P' ')' 0x00 -Q 'Q' '7' 'q' 'Q' '*' 0x0300 -R 'R' '7' 'r' 'R' '3' 0x20AC -S 'S' '7' 's' 'S' '4' 0x00DF -T 'T' '8' 't' 'T' '+' 0x00A3 -U 'U' '8' 'u' 'U' '&' 0x0308 -V 'V' '8' 'v' 'V' '=' '^' -W 'W' '9' 'w' 'W' '1' 0x00 -X 'X' '9' 'x' 'X' '8' 0xEF00 -Y 'Y' '9' 'y' 'Y' '%' 0x00A1 -Z 'Z' '9' 'z' 'Z' '7' 0x00 - -# on pc keyboards -COMMA ',' ',' ',' ';' ';' '|' -PERIOD '.' '.' '.' ':' ':' 0x2026 -AT '@' '0' '@' '0' '0' 0x2022 -SLASH '/' '/' '/' '?' '?' '\' - -SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01 -ENTER 0xa 0xa 0xa 0xa 0xa 0xa - -TAB 0x9 0x9 0x9 0x9 0x9 0x9 -0 '0' '0' '0' ')' ')' ')' -1 '1' '1' '1' '!' '!' '!' -2 '2' '2' '2' '@' '@' '@' -3 '3' '3' '3' '#' '#' '#' -4 '4' '4' '4' '$' '$' '$' -5 '5' '5' '5' '%' '%' '%' -6 '6' '6' '6' '^' '^' '^' -7 '7' '7' '7' '&' '&' '&' -8 '8' '8' '8' '*' '*' '*' -9 '9' '9' '9' '(' '(' '(' - -GRAVE '`' '`' '`' '~' '`' '~' -MINUS '-' '-' '-' '_' '-' '_' -EQUALS '=' '=' '=' '+' '=' '+' -LEFT_BRACKET '[' '[' '[' '{' '[' '{' -RIGHT_BRACKET ']' ']' ']' '}' ']' '}' -BACKSLASH '\' '\' '\' '|' '\' '|' -SEMICOLON ';' ';' ';' ':' ';' ':' -APOSTROPHE ''' ''' ''' '"' ''' '"' -STAR '*' '*' '*' '*' '*' '*' -POUND '#' '#' '#' '#' '#' '#' -PLUS '+' '+' '+' '+' '+' '+' - +# Copyright (C) 2010 The Android Open Source 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. + +type SPECIAL_FUNCTION diff --git a/s3c-keypad.kl b/s3c-keypad.kl index 2bcff82..72f3f4e 100644 --- a/s3c-keypad.kl +++ b/s3c-keypad.kl @@ -1,3 +1,17 @@ +# Copyright (C) 2010 The Android Open Source 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. + key 42 VOLUME_UP WAKE key 58 VOLUME_DOWN WAKE key 50 HOME WAKE_DROPPED diff --git a/sec_jack.kcm b/sec_jack.kcm new file mode 100644 index 0000000..7ee6e5a --- /dev/null +++ b/sec_jack.kcm @@ -0,0 +1,15 @@ +# Copyright (C) 2010 The Android Open Source 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. + +type SPECIAL_FUNCTION diff --git a/sec_jack.kl b/sec_jack.kl index 92d6553..1a421d6 100644 --- a/sec_jack.kl +++ b/sec_jack.kl @@ -1,3 +1,17 @@ +# Copyright (C) 2010 The Android Open Source 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. + key 163 MEDIA_NEXT WAKE key 165 MEDIA_PREVIOUS WAKE key 226 HEADSETHOOK WAKE |
