hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Variety of changes based on suggestions from ADT Lint. Includes removing extra drawables left about after switching to ActionBarSherlock. Layout changes for speed improvements. etc.

Browse Source
This commit is contained in:
Kevin Ruland 2012-05-23 21:20:46 +00:00
parent 743ba0f57d
commit e754dab0ca
15 changed files with 13 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/res/drawable-hdpi/actionbar_shadow.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 953 B

BIN
android/res/drawable-mdpi/actionbar_shadow.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 952 B

BIN
android/res/drawable-mdpi/ic_home_carat.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
android/res/drawable-xhdpi/actionbar_shadow.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 955 B

23
android/res/drawable/actionbar_compat_item.xml
View File

@ -1,23 +0,0 @@
<!--
Copyright 2011 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/actionbar_compat_item_pressed"
android:state_pressed="true" />
<item android:drawable="@drawable/actionbar_compat_item_focused"
android:state_focused="true" />
<item android:drawable="@android:color/transparent" />
</selector>

19
android/res/drawable/actionbar_compat_item_focused.xml
View File

@ -1,19 +0,0 @@
<!--
Copyright 2011 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">
<solid android:color="#ef7000" />
</shape>

19
android/res/drawable/actionbar_compat_item_pressed.xml
View File

@ -1,19 +0,0 @@
<!--
Copyright 2011 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">
<solid android:color="#eda700" />
</shape>

4
android/res/drawable/home_item.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/or_launcher"/>

1
android/res/layout-xlarge-land/motorbrowser.xml
View File

@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal" >
<FrameLayout

4
android/res/layout/component_list_item.xml
View File

@ -3,11 +3,11 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical"
padding="2dip" >
android:padding="2dip" >
<TextView
android:id="@android:id/text1"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="4dip"

2
android/res/layout/filebrowser_list_item.xml
View File

@ -11,7 +11,7 @@
<TextView
android:id="@+id/filebrowser_list_item_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"

1
android/res/layout/tcqueryform.xml
View File

@ -49,6 +49,7 @@
android:text="@string/motor_commonname" />
<EditText
android:inputType="text"
android:id="@+id/TCMotorSearchFormCommonNameField"
android:text="" />
</TableRow>

5
android/res/layout/tree_list_item_wrapper.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="fill_parent"
android:baselineAligned="false" >
<LinearLayout
android:id="@+id/treeview_list_item_image_layout"
@ -19,7 +20,7 @@
<FrameLayout
android:id="@+id/treeview_list_item_frame"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1" >
</FrameLayout>

2
android/res/menu/rocket_viewer_option_menu.xml
View File

@ -7,7 +7,7 @@
<item
android:id="@+id/motor_list_menu_option"
android:icon="@drawable/ic_motorbrowser"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/viewmotorslabel"/>
<item
android:id="@+id/preference_menu_option"

4
android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
View File

@ -132,7 +132,7 @@ public class BurnPlotFragment extends Fragment {
int datasize = timePoints.length;
for( int i = 0; i<datasize; i++ ) {
series.add(timePoints[i], thrustPoints[i]);
int ceil = new Double(Math.ceil(thrustPoints[i])).intValue();
int ceil =(int) Math.ceil(thrustPoints[i]);
if ( ceil > maxy ) {
maxy = ceil;
}
@ -144,7 +144,7 @@ public class BurnPlotFragment extends Fragment {
if ( maxx >= 2.0 ) {
maxx = Math.ceil(maxx);
} else {
maxx = new Double( Math.ceil(maxx*10.0) ).intValue() /10.0;
maxx = Math.ceil(maxx*10.0) /10.0;
}
renderer.setXAxisMax(maxx);