diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-13 14:24:59 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:30:09 +0000 |
| commit | 4815d6e5a658bb1b301f7724c8e8fff6bc764bba (patch) | |
| tree | 66f6e6484d239545197d73bcca8ad2505246c981 /data | |
| parent | eaa7d1835c8691dd656fea99ae3d61b039ebe1b7 (diff) | |
| parent | 763ef60466ac752a3031719fb86b08486c9946b1 (diff) | |
| download | frameworks_base-4815d6e5a658bb1b301f7724c8e8fff6bc764bba.zip frameworks_base-4815d6e5a658bb1b301f7724c8e8fff6bc764bba.tar.gz frameworks_base-4815d6e5a658bb1b301f7724c8e8fff6bc764bba.tar.bz2 | |
Merge commit 'android-4.2.2_r1' into mr1.1-staging
Conflicts:
core/java/android/os/Trace.java
core/java/android/widget/Toast.java
core/res/res/values-cs/strings.xml
core/res/res/values-el/strings.xml
core/res/res/values-iw/strings.xml
core/res/res/values/config.xml
core/res/res/values/symbols.xml
media/java/android/media/AudioService.java
packages/SystemUI/res/values-sv/strings.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardMessageArea.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
services/java/com/android/server/NotificationManagerService.java
services/java/com/android/server/power/ElectronBeam.java
Change-Id: I60b8ddf20a1d7bcf9dc7b1a4ed841aaa4d953294
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/platform.xml | 1 | ||||
| -rw-r--r-- | data/fonts/DroidSansThai.ttf | bin | 35584 -> 35480 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 16 | ||||
| -rwxr-xr-x | data/sounds/AudioPackage10.mk | 1 | ||||
| -rw-r--r-- | data/sounds/effects/ogg/LowBattery.ogg | bin | 17786 -> 12401 bytes | |||
| -rw-r--r-- | data/sounds/effects/ogg/WirelessChargingStarted.ogg | bin | 0 -> 12025 bytes |
6 files changed, 11 insertions, 7 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 559b5e4..12f62fe 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -139,6 +139,7 @@ <assign-permission name="android.permission.ACCESS_NETWORK_STATE" uid="shell" /> <assign-permission name="android.permission.ACCESS_WIFI_STATE" uid="shell" /> <assign-permission name="android.permission.BLUETOOTH" uid="shell" /> + <assign-permission name="android.permission.EXPAND_STATUS_BAR" uid="shell" /> <!-- System tool permissions granted to the shell. --> <assign-permission name="android.permission.GET_TASKS" uid="shell" /> <assign-permission name="android.permission.CHANGE_CONFIGURATION" uid="shell" /> diff --git a/data/fonts/DroidSansThai.ttf b/data/fonts/DroidSansThai.ttf Binary files differindex c078be0..15b00c2 100644 --- a/data/fonts/DroidSansThai.ttf +++ b/data/fonts/DroidSansThai.ttf diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 50ff437..999ddc4 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -103,21 +103,23 @@ </family> <family> <fileset> - <file>DroidSansFallback.ttf</file> + <file>Lohit-Telugu.ttf</file> </fileset> </family> <family> <fileset> - <file lang="ja">MTLmr3m.ttf</file> + <file>DroidSansFallback.ttf</file> </fileset> </family> - <!-- - Fonts below this point have problematic glyphs and should not be moved - higher in the fallback list until those glyphs have been fixed. - --> <family> <fileset> - <file>Lohit-Telugu.ttf</file> <!-- masks U+FFBC-10007 --> + <file lang="ja">MTLmr3m.ttf</file> </fileset> </family> + <!-- Note: complex scripts (i.e. those requiring shaping in Harfbuzz) have + a cumulative limit of 64k glyphs. Thus, if they are placed after the + large fonts such as DroidSansFallback, they are likely to render + incorrectly. Please use caution when putting fonts toward the end of + the list. + --> </familyset> diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk index cb55bba..b40e385 100755 --- a/data/sounds/AudioPackage10.mk +++ b/data/sounds/AudioPackage10.mk @@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \ $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ diff --git a/data/sounds/effects/ogg/LowBattery.ogg b/data/sounds/effects/ogg/LowBattery.ogg Binary files differindex 710e385..ab9eba3 100644 --- a/data/sounds/effects/ogg/LowBattery.ogg +++ b/data/sounds/effects/ogg/LowBattery.ogg diff --git a/data/sounds/effects/ogg/WirelessChargingStarted.ogg b/data/sounds/effects/ogg/WirelessChargingStarted.ogg Binary files differnew file mode 100644 index 0000000..66f6cd2 --- /dev/null +++ b/data/sounds/effects/ogg/WirelessChargingStarted.ogg |