Skip to content

Commit

Permalink
merge from eclair
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-Baptiste Queru committed Nov 15, 2009
2 parents a7653ca + 64a9bd5 commit 23c4c01
Show file tree
Hide file tree
Showing 30 changed files with 240 additions and 177 deletions.
2 changes: 1 addition & 1 deletion Android.mk
View file
Expand Up @@ -27,7 +27,7 @@ include $(BUILD_PACKAGE)
##################################################
include $(CLEAR_VARS)

LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-1.3.1.jar
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libarity:arity-1.3.3.jar
include $(BUILD_MULTI_PREBUILT)

# Use the folloing include to make our test apk.
Expand Down
2 changes: 1 addition & 1 deletion AndroidManifest.xml
View file
Expand Up @@ -3,7 +3,7 @@
package="com.android.calculator2">
<application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Calculator"
android:theme="@android:style/Theme.Black">
android:theme="@android:style/Theme.Black.NoTitleBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
Binary file removed arity-1.3.1.jar
View file
Binary file not shown.
Binary file added arity-1.3.3.jar
View file
Binary file not shown.
Binary file added res/drawable-hdpi/advanced.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/clear_history.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/icon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/simple.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 res/drawable/advanced.png → res/drawable-mdpi/advanced.png
View file
File renamed without changes
0 res/drawable/clear_history.png → res/drawable-mdpi/clear_history.png
View file
File renamed without changes
0 res/drawable/icon.png → res/drawable-mdpi/icon.png
View file
File renamed without changes
0 res/drawable/simple.png → res/drawable-mdpi/simple.png
View file
File renamed without changes
21 changes: 21 additions & 0 deletions res/drawable/blue_button.xml
View file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 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.
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#071622" android:endColor="#253541"
android:angle="90"/>
<corners android:radius="0dp" />
</shape>
Binary file removed res/drawable/button.png
View file
Binary file not shown.
21 changes: 21 additions & 0 deletions res/drawable/button.xml
View file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 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.
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#000000" android:endColor="#333333"
android:angle="90"/>
<corners android:radius="0dp" />
</shape>
Binary file removed res/drawable/button_bg.png
View file
Binary file not shown.
Binary file removed res/drawable/lcd.9.png
View file
Binary file not shown.
Binary file removed res/drawable/small_button.9.png
View file
Binary file not shown.
Binary file removed res/drawable/small_button_pressed.9.png
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions res/drawable/small_button_stateful.xml
View file

This file was deleted.

82 changes: 42 additions & 40 deletions res/layout-land/main.xml
View file
Expand Up @@ -23,40 +23,42 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#ff000000">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_weight="2"
>

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_marginLeft="0px"
android:layout_marginRight="0px"
android:layout_marginBottom="0px"
>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/lcd"
android:layout_marginRight="0px"
>

<com.android.calculator2.CalculatorDisplay
android:id="@+id/display"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="5"
android:layout_height="fill_parent"
>

<EditText style="@style/display_style" />
<EditText style="@style/display_style" />

</com.android.calculator2.CalculatorDisplay>
</LinearLayout>
</RelativeLayout>
</com.android.calculator2.CalculatorDisplay>

<com.android.calculator2.ColorButton
android:id="@+id/del"
android:text="@string/clear"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="fill_parent"
android:textColor="#ffffffff"
android:layout_marginRight="0dp"
android:textSize="15dp"
style="@style/button_style"
/>
</LinearLayout>

<com.android.calculator2.PanelSwitcher
android:id="@+id/panelswitch"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="0dp"
android:layout_weight="5"
>

<LinearLayout
Expand All @@ -69,22 +71,22 @@
<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_height="0dp"
>
<com.android.calculator2.ColorButton
android:id="@+id/digit7"
android:text="@string/digit7"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit8"
android:text="@string/digit8"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit9"
android:text="@string/digit9"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/leftParen"
Expand All @@ -106,27 +108,27 @@
<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_height="0dp"
>
<com.android.calculator2.ColorButton
android:id="@+id/digit4"
android:text="@string/digit4"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit5"
android:text="@string/digit5"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit6"
android:text="@string/digit6"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/dot"
android:text="@string/dot"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/div"
Expand All @@ -143,27 +145,27 @@
<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_height="0dp"
>
<com.android.calculator2.ColorButton
android:id="@+id/digit1"
android:text="@string/digit1"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit2"
android:text="@string/digit2"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit3"
android:text="@string/digit3"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/digit0"
android:text="@string/digit0"
style="@style/button_style"
style="@style/digit_button_style"
/>
<com.android.calculator2.ColorButton
android:id="@+id/equal"
Expand All @@ -185,14 +187,14 @@
android:layout_weight="1"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginTop="5px"
android:layout_marginBottom="0px"
android:layout_marginTop="5dp"
android:layout_marginBottom="0dp"
>

<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_height="0dp"
>
<com.android.calculator2.ColorButton
android:id="@+id/sin"
Expand Down Expand Up @@ -224,7 +226,7 @@
<LinearLayout
android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_height="0dp"
>
<com.android.calculator2.ColorButton
android:id="@+id/ln"
Expand Down

0 comments on commit 23c4c01

Please sign in to comment.