Merge remote-tracking branch 'upstream/jellybean' into jellybean

config/pac_common.mk

@@ -35,11 +35,6 @@ PRODUCT_COPY_FILES += \
     vendor/pa/prebuilt/$(PA_CONF_SOURCE).conf:system/etc/paranoid/properties.conf \
     vendor/pa/prebuilt/$(PA_CONF_SOURCE).conf:system/etc/paranoid/backup.conf
 
-### PAC ###
-# Common Proprietary
-#PRODUCT_COPY_FILES += \
-#    vendor/pac/prebuilt/common/app/FileManager.apk:system/app/FileManager.apk
-
 BOARD := $(subst pac_,,$(TARGET_PRODUCT))
 
 # Add CM release version
@@ -48,21 +43,21 @@ CM_BUILD := $(BOARD)
 
 PA_VERSION_MAJOR = 2
 PA_VERSION_MINOR = 5
-PA_VERSION_MAINTENANCE = 3
+PA_VERSION_MAINTENANCE = 5
 
 TARGET_CUSTOM_RELEASETOOL := vendor/pac/tools/squisher
 
 VERSION := $(PA_VERSION_MAJOR).$(PA_VERSION_MINOR)$(PA_VERSION_MAINTENANCE)
 PA_VERSION := pa_$(BOARD)-$(VERSION)-$(shell date +%0d%^b%Y-%H%M%S)
 
-PAC_VERSION_MAJOR = 18
+PAC_VERSION_MAJOR = 19
 PAC_VERSION_MINOR = 0
 PAC_VERSION_MAINTENANCE = 1
 PAC_VERSION := $(PAC_VERSION_MAJOR).$(PAC_VERSION_MINOR).$(PAC_VERSION_MAINTENANCE)
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.pac.version=$(PAC_VERSION) \
-    ro.pacrom.version=$(BOARD)_PAC_JB_ALPHA-v$(PAC_VERSION) \
+    ro.pacrom.version=$(BOARD)_PAC_JB_4.1.2-v$(PAC_VERSION) \
     ro.modversion=$(PA_VERSION) \
     ro.pa.family=$(PA_CONF_SOURCE) \
     ro.pa.version=$(VERSION) \

overlay/common/hdpi/packages/apps/Trebuchet/res/values/config.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="cell_count_y">5</integer>
+</resources>

overlay/common/hdpi/packages/apps/Trebuchet/res/xml/default_workspace.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+    <!-- Far-left screen [0] -->
+
+    <!-- Left screen [1] -->
+    <appwidget
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="4"
+        launcher:spanX="4"
+        launcher:spanY="1" />
+
+    <!-- Middle screen [2] -->
+    <appwidget
+        launcher:packageName="com.android.deskclock"
+        launcher:className="com.android.alarmclock.AnalogAppWidgetProvider"
+        launcher:screen="2"
+        launcher:x="1"
+        launcher:y="0"
+        launcher:spanX="2"
+        launcher:spanY="2" />
+    <favorite
+        launcher:packageName="com.android.camera"
+        launcher:className="com.android.camera.Camera"
+        launcher:screen="2"
+        launcher:x="0"
+        launcher:y="4" />
+
+    <!-- Right screen [3] -->
+    <favorite
+        launcher:packageName="com.android.gallery3d"
+        launcher:className="com.android.gallery3d.app.Gallery"
+        launcher:screen="3"
+        launcher:x="1"
+        launcher:y="4" />
+    <favorite
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="3"
+        launcher:x="2"
+        launcher:y="4" />
+
+    <!-- Far-right screen [4] -->
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.contacts"
+        launcher:className="com.android.contacts.activities.PeopleActivity"
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.mms"
+        launcher:className="com.android.mms.ui.ConversationList"
+        launcher:container="-101"
+        launcher:screen="3"
+        launcher:x="3"
+        launcher:y="0" />
+    <favorite
+        launcher:packageName="com.android.browser"
+        launcher:className="com.android.browser.BrowserActivity"
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" />
+</favorites>

products/pac_anzu.mk

@@ -7,7 +7,11 @@ OVERLAY_TARGET := pa_hdpi
 # AOKP device overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/anzu
 
+# Common device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/common/hdpi
+
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/hdpi_480x854
 $(shell cp -f vendor/pac/overlay/pac/sony/hdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PAC boot logo

products/pac_cooper.mk

@@ -8,6 +8,7 @@ OVERLAY_TARGET := pa_mdpi
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/cooper
 
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/mdpi
 $(shell cp -f vendor/pac/overlay/pac/samsung/mdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # include ParanoidAndroid common configuration

products/pac_haida.mk

@@ -7,7 +7,11 @@ OVERLAY_TARGET := pa_hdpi
 # AOKP device overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/haida
 
+# Common device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/common/hdpi
+
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/hdpi_480x854
 $(shell cp -f vendor/pac/overlay/pac/sony/hdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PAC boot logo

products/pac_jewel.mk~

-# Check for target product
-ifeq (pac_jewel,$(TARGET_PRODUCT))
-
-# OVERLAY_TARGET adds overlay asset source
-OVERLAY_TARGET := pa_xhdpi
-
-# AOKP device overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/galaxys2
-
-# PAC device overlay
-$(shell cp -f vendor/pac/overlay/pac/htc/xhdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
-
-# include ParanoidAndroid common configuration
-include vendor/pac/config/pac_common.mk
-
-# Inherit CM device configuration
-$(call inherit-product, device/htc/jewel/cm.mk)
-
-PRODUCT_NAME := pac_jewel
-
-endif

products/pac_mango.mk

@@ -8,6 +8,7 @@ OVERLAY_TARGET := pa_mdpi
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/mango
 
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/mdpi
 $(shell cp -f vendor/pac/overlay/pac/sony/mdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PA settings overlay

products/pac_smultron.mk

@@ -8,6 +8,7 @@ OVERLAY_TARGET := pa_mdpi
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/smultron
 
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/mdpi
 $(shell cp -f vendor/pac/overlay/pac/sony/mdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PAC boot logo

products/pac_urushi.mk

@@ -7,7 +7,11 @@ OVERLAY_TARGET := pa_hdpi
 # AOKP device overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/urushi
 
+# Common device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/common/hdpi
+
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/hdpi_480x854
 $(shell cp -f vendor/pac/overlay/pac/sony/hdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PAC boot logo

products/pac_zeus.mk

@@ -7,7 +7,11 @@ OVERLAY_TARGET := pa_hdpi
 # AOKP device overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/zeus
 
+# Common device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/common/hdpi
+
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/hdpi_480x854
 $(shell cp -f vendor/pac/overlay/pac/sony/hdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PA settings overlay

products/pac_zeusc.mk

@@ -7,7 +7,11 @@ OVERLAY_TARGET := pa_hdpi
 # AOKP device overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/aokp/device/zeusc
 
+# Common device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/common/hdpi
+
 # PAC device overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/pac/overlay/pac/common/hdpi_480x854
 $(shell cp -f vendor/pac/overlay/pac/sony/hdpi/frameworks/base/core/res/assets/images/android-logo-mask.png frameworks/base/core/res/assets/images/android-logo-mask.png)
 
 # PA settings overlay