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.
This commit is contained in:
		
							parent
							
								
									743ba0f57d
								
							
						
					
					
						commit
						e754dab0ca
					
				
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 953 B  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 952 B  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 1.1 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 955 B  | 
@ -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>
 | 
					 | 
				
			||||||
@ -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>
 | 
					 | 
				
			||||||
@ -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>
 | 
					 | 
				
			||||||
@ -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"/>
 | 
					 | 
				
			||||||
@ -2,18 +2,19 @@
 | 
				
			|||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 | 
				
			||||||
    android:layout_width="match_parent"
 | 
					    android:layout_width="match_parent"
 | 
				
			||||||
    android:layout_height="match_parent"
 | 
					    android:layout_height="match_parent"
 | 
				
			||||||
 | 
					    android:baselineAligned="false"
 | 
				
			||||||
    android:orientation="horizontal" >
 | 
					    android:orientation="horizontal" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <FrameLayout
 | 
					    <FrameLayout
 | 
				
			||||||
        android:id="@+id/motorBrowserList"
 | 
					        android:id="@+id/motorBrowserList"
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
        android:layout_height="match_parent"
 | 
					        android:layout_height="match_parent"
 | 
				
			||||||
        android:layout_weight="4"/>
 | 
					        android:layout_weight="4" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <FrameLayout
 | 
					    <FrameLayout
 | 
				
			||||||
        android:id="@+id/sidepane"
 | 
					        android:id="@+id/sidepane"
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					        android:layout_width="wrap_content"
 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
        android:layout_weight="1"/>
 | 
					        android:layout_weight="1" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</LinearLayout>
 | 
					</LinearLayout>
 | 
				
			||||||
@ -3,11 +3,11 @@
 | 
				
			|||||||
    android:layout_width="fill_parent"
 | 
					    android:layout_width="fill_parent"
 | 
				
			||||||
    android:layout_height="fill_parent"
 | 
					    android:layout_height="fill_parent"
 | 
				
			||||||
    android:gravity="center_vertical"
 | 
					    android:gravity="center_vertical"
 | 
				
			||||||
    padding="2dip" >
 | 
					    android:padding="2dip" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <TextView
 | 
					    <TextView
 | 
				
			||||||
        android:id="@android:id/text1"
 | 
					        android:id="@android:id/text1"
 | 
				
			||||||
        android:layout_width="fill_parent"
 | 
					        android:layout_width="0dp"
 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
        android:layout_weight="1"
 | 
					        android:layout_weight="1"
 | 
				
			||||||
        android:padding="4dip"
 | 
					        android:padding="4dip"
 | 
				
			||||||
 | 
				
			|||||||
@ -11,7 +11,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <TextView
 | 
					    <TextView
 | 
				
			||||||
        android:id="@+id/filebrowser_list_item_name"
 | 
					        android:id="@+id/filebrowser_list_item_name"
 | 
				
			||||||
        android:layout_width="wrap_content"
 | 
					        android:layout_width="0dp"
 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					        android:layout_height="wrap_content"
 | 
				
			||||||
        android:layout_weight="1"
 | 
					        android:layout_weight="1"
 | 
				
			||||||
        android:gravity="center_vertical"
 | 
					        android:gravity="center_vertical"
 | 
				
			||||||
 | 
				
			|||||||
@ -49,6 +49,7 @@
 | 
				
			|||||||
                android:text="@string/motor_commonname" />
 | 
					                android:text="@string/motor_commonname" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <EditText
 | 
					            <EditText
 | 
				
			||||||
 | 
					                android:inputType="text"
 | 
				
			||||||
                android:id="@+id/TCMotorSearchFormCommonNameField"
 | 
					                android:id="@+id/TCMotorSearchFormCommonNameField"
 | 
				
			||||||
                android:text="" />
 | 
					                android:text="" />
 | 
				
			||||||
        </TableRow>
 | 
					        </TableRow>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,8 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?>
 | 
					<?xml version="1.0" encoding="utf-8"?>
 | 
				
			||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 | 
				
			||||||
    android:layout_width="fill_parent"
 | 
					    android:layout_width="fill_parent"
 | 
				
			||||||
    android:layout_height="fill_parent" >
 | 
					    android:layout_height="fill_parent"
 | 
				
			||||||
 | 
					    android:baselineAligned="false" >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <LinearLayout
 | 
					    <LinearLayout
 | 
				
			||||||
        android:id="@+id/treeview_list_item_image_layout"
 | 
					        android:id="@+id/treeview_list_item_image_layout"
 | 
				
			||||||
@ -19,7 +20,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <FrameLayout
 | 
					    <FrameLayout
 | 
				
			||||||
        android:id="@+id/treeview_list_item_frame"
 | 
					        android:id="@+id/treeview_list_item_frame"
 | 
				
			||||||
        android:layout_width="fill_parent"
 | 
					        android:layout_width="0dp"
 | 
				
			||||||
        android:layout_height="fill_parent"
 | 
					        android:layout_height="fill_parent"
 | 
				
			||||||
        android:layout_weight="1" >
 | 
					        android:layout_weight="1" >
 | 
				
			||||||
    </FrameLayout>
 | 
					    </FrameLayout>
 | 
				
			||||||
 | 
				
			|||||||
@ -7,7 +7,7 @@
 | 
				
			|||||||
    <item
 | 
					    <item
 | 
				
			||||||
        android:id="@+id/motor_list_menu_option"
 | 
					        android:id="@+id/motor_list_menu_option"
 | 
				
			||||||
        android:icon="@drawable/ic_motorbrowser"
 | 
					        android:icon="@drawable/ic_motorbrowser"
 | 
				
			||||||
        android:showAsAction="always"
 | 
					        android:showAsAction="ifRoom"
 | 
				
			||||||
        android:title="@string/viewmotorslabel"/>
 | 
					        android:title="@string/viewmotorslabel"/>
 | 
				
			||||||
    <item
 | 
					    <item
 | 
				
			||||||
        android:id="@+id/preference_menu_option"
 | 
					        android:id="@+id/preference_menu_option"
 | 
				
			||||||
 | 
				
			|||||||
@ -132,7 +132,7 @@ public class BurnPlotFragment extends Fragment {
 | 
				
			|||||||
		int datasize = timePoints.length;
 | 
							int datasize = timePoints.length;
 | 
				
			||||||
		for( int i = 0; i<datasize; i++ ) {
 | 
							for( int i = 0; i<datasize; i++ ) {
 | 
				
			||||||
			series.add(timePoints[i], thrustPoints[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 ) {
 | 
								if ( ceil > maxy ) {
 | 
				
			||||||
				maxy = ceil;
 | 
									maxy = ceil;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
@ -144,7 +144,7 @@ public class BurnPlotFragment extends Fragment {
 | 
				
			|||||||
		if ( maxx >= 2.0 ) {
 | 
							if ( maxx >= 2.0 ) {
 | 
				
			||||||
			maxx = Math.ceil(maxx);
 | 
								maxx = Math.ceil(maxx);
 | 
				
			||||||
		} else {
 | 
							} else {
 | 
				
			||||||
			maxx = new Double( Math.ceil(maxx*10.0) ).intValue() /10.0;
 | 
								maxx = Math.ceil(maxx*10.0) /10.0;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		renderer.setXAxisMax(maxx);
 | 
							renderer.setXAxisMax(maxx);
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user