Changeset 1d620a4 in orbit for android/res


Ignore:
Timestamp:
12/23/13 09:35:12 (8 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
f41f5d3
Parents:
b38c13f
Message:
  • checkBox added for Controlled Descent
Location:
android/res
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • android/res/layout/fragment_advanced.xml

    r3444b8e r1d620a4  
    220220        android:orientation="horizontal" > 
    221221 
    222         <!-- 
    223              <View 
    224             android:id="@+id/viewSpaceTiltSensorControl" 
    225             android:layout_width="10dp" 
    226             android:layout_height="0dp" > 
    227         </View> 
    228         --> 
    229  
    230222        <CheckBox 
    231223            android:id="@+id/checkBoxTiltSensorControl" 
     
    247239    </LinearLayout> 
    248240 
     241    <LinearLayout 
     242        android:id="@+id/layoutControlledDescent" 
     243        android:layout_width="wrap_content" 
     244        android:layout_height="wrap_content" 
     245        android:layout_gravity="center" 
     246        android:gravity="center" 
     247        android:orientation="horizontal" > 
     248 
     249        <CheckBox 
     250            android:id="@+id/checkBoxControlledDescent" 
     251            android:layout_width="wrap_content" 
     252            android:layout_height="wrap_content" 
     253            android:text="@string/checkbox_controlled_descent" /> 
     254    </LinearLayout> 
     255     
    249256    <ScrollView 
    250257        android:id="@+id/scrollViewDebugConsole" 
  • android/res/values/strings.xml

    r3444b8e r1d620a4  
    5858    <string name="checkbox_tilt_sensor_control_throttle">Adjust Throttle Only</string> 
    5959    <string name="checkbox_tilt_sensor_control_throttle_small">Throttle Only</string> 
     60    <string name="checkbox_controlled_descent">Controlled Descent</string> 
    6061    <string name="textview_throttle">Throttle</string> 
    6162    <string name="textview_yaw">Yaw</string> 
Note: See TracChangeset for help on using the changeset viewer.