Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/ics' into 23072012
Browse files Browse the repository at this point in the history 
Conflicts:
	Android.mk
	BoardConfigCommon.mk
	board-info.txt
	device_base.mk
	egl.cfg
	factory-images/generate-factory-images-package.sh
	kernel
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: If153de549a1a3b5145f856de6c55c825d3124a11
  • Loading branch information
@KalimochoAz
KalimochoAz committed Jul 23, 2012
2 parents 55709d4 + b5f4a69 commit 8e8baa7
Show file tree
Hide file tree
Showing 71 changed files with 3,625 additions and 51 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.orig
*~
2 changes: 0 additions & 2 deletions Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@
LOCAL_PATH := $(call my-dir)

ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),)

include $(call all-makefiles-under,$(LOCAL_PATH))

endif
11 changes: 11 additions & 0 deletions BoardConfigCommon.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,21 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
TARGET_RECOVERY_UI_LIB := librecovery_ui_crespo
TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/crespo

# Define kernel config for inline building
TARGET_KERNEL_CONFIG := crespo_defconfig
TARGET_KERNEL_SOURCE := kernel/samsung/crespo

TARGET_USERIMAGES_USE_EXT4 := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 536870912
BOARD_USERDATAIMAGE_PARTITION_SIZE := 1073741824
BOARD_FLASH_BLOCK_SIZE := 4096


BOARD_HAS_NO_SELECT_BUTTON := true
BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/crespo/graphics.c

BOARD_USE_SKIA_LCDTEXT := true

# Connectivity - Wi-Fi
WPA_SUPPLICANT_VERSION := VER_0_8_X
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
Expand All @@ -88,3 +98,4 @@ USE_OPENGL_RENDERER := true
TARGET_DISABLE_TRIPLE_BUFFERING := false

BOARD_ALLOW_EGL_HIBERNATION := true

15 changes: 15 additions & 0 deletions CrespoParts/Android.mk
View file
Original file line number Diff line number Diff line change
@@ -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 := CrespoParts
LOCAL_CERTIFICATE := platform

include $(BUILD_PACKAGE)

include $(call all-makefiles-under,$(LOCAL_PATH))
31 changes: 31 additions & 0 deletions CrespoParts/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cyanogenmod.settings.device"
android:sharedUserId="android.uid.system" >

<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

<application android:label="@string/app_name" >
<activity
android:name="com.cyanogenmod.settings.device.DeviceSettings"
android:icon="@drawable/ic_launcher_cmdevicesettings"
android:label="@string/app_name" >
<intent-filter>
<action android:name="com.cyanogenmod.action.LAUNCH_DEVICE_SETTINGS" />
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>

<receiver android:name=".Startup" >
<intent-filter android:priority="100" >
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>

<activity android:name=".GeneralFragmentActivity" />
<activity android:name=".DisplayFragmentActivity" />
<activity android:name=".SoundFragmentActivity" />
</application>

</manifest>
9 changes: 9 additions & 0 deletions CrespoParts/res/drawable/blue_tuning_preview.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="0"
android:startColor="#000000"
android:endColor="#0000FF" />
</shape>
9 changes: 9 additions & 0 deletions CrespoParts/res/drawable/color_tuning_preview.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="0"
android:startColor="#000000"
android:endColor="#FFFFFF" />
</shape>
9 changes: 9 additions & 0 deletions CrespoParts/res/drawable/green_tuning_preview.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="0"
android:startColor="#000000"
android:endColor="#00FF00" />
</shape>
Binary file added CrespoParts/res/drawable/ic_launcher_cmdevicesettings.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions CrespoParts/res/drawable/red_tuning_preview.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="0"
android:startColor="#000000"
android:endColor="#FF0000" />
</shape>
87 changes: 87 additions & 0 deletions CrespoParts/res/layout/idle_stats_dialog.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1,2,3"
android:padding="3dip">

<TableRow >

<TextView
android:layout_column="1"
android:text="@string/label_state" />

<TextView
android:layout_column="2"
android:gravity="right"
android:text="@string/label_time" />

<TextView
android:layout_column="3"
android:gravity="right"
android:text="@string/label_average" />
</TableRow>

<View
android:layout_height="1dip"
android:layout_marginBottom="3dip"
android:background="#FF909090" />

<TableRow >

<TextView
android:layout_column="1"
android:text="@string/label_idle1" />

<TextView
android:layout_column="2"
android:gravity="right"
android:id="@+id/time1"
android:text="@+id/time1" />

<TextView
android:layout_column="3"
android:gravity="right"
android:id="@+id/avg1"
android:text="@+id/avg1" />
</TableRow>

<TableRow >

<TextView
android:layout_column="1"
android:text="@string/label_idle2" />

<TextView
android:layout_column="2"
android:gravity="right"
android:id="@+id/time2"
android:text="@+id/time2" />

<TextView
android:layout_column="3"
android:gravity="right"
android:id="@+id/avg2"
android:text="@+id/avg2" />
</TableRow>

<TableRow >

<TextView
android:layout_column="1"
android:text="@string/label_idle3" />

<TextView
android:layout_column="2"
android:gravity="right"
android:id="@+id/time3"
android:text="@+id/time3" />

<TextView
android:layout_column="3"
android:gravity="right"
android:id="@+id/avg3"
android:text="@+id/avg3" />
</TableRow>

</TableLayout>
120 changes: 120 additions & 0 deletions CrespoParts/res/layout/preference_colorgamma_presets.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:paddingBottom="20dip">

<ImageView
android:id="@+id/imageView0"
android:layout_width="match_parent"
android:layout_height="200dp"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:paddingTop="5dip"
android:src="@drawable/color_tuning_preview" />

<ImageView
android:id="@+id/imageView1"
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:paddingTop="5dip"
android:src="@drawable/red_tuning_preview" />

<ImageView
android:id="@+id/imageView2"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_below="@+id/imageView1"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:paddingTop="5dip"
android:src="@drawable/green_tuning_preview" />

<ImageView
android:id="@+id/imageView3"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_below="@+id/imageView2"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:paddingTop="5dip"
android:src="@drawable/blue_tuning_preview" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView0"
android:orientation="vertical" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" >

<Button
android:id="@+id/btnPreset1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/preset1_default_title" android:textSize="10dp" android:width="100dp"/>

<Button
android:id="@+id/btnPreset2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/preset2_default_title" android:textSize="10dp" android:width="100dp"/>

<Button
android:id="@+id/btnPreset3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/preset3_default_title" android:textSize="10dp" android:width="100dp"/>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<Button
android:id="@+id/btnPreset4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/preset4_default_title" android:textSize="10dp" android:width="100dp"/>

<Button
android:id="@+id/btnPreset5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/preset5_default_title" android:textSize="10dp" android:width="100dp"/>

<Button
android:id="@+id/btnPreset6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/preset6_default_title" android:textSize="10dp" android:width="100dp"/>
</LinearLayout>

<LinearLayout
android:layout_width="320dp"
android:layout_height="wrap_content"
android:layout_weight="1" >

<TextView
android:id="@+id/textView1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/credits_presets" android:textSize="12dp"/>

</LinearLayout>
</LinearLayout>

</RelativeLayout>

</ScrollView>
Loading

0 comments on commit 8e8baa7

Please sign in to comment.