Merge "Add on/off actionbar switch for NFC Tap To Share."

This commit is contained in:
Martijn Coenen
2011-07-28 06:48:55 -07:00
committed by Android (Google) Code Review
4 changed files with 59 additions and 40 deletions

View File

@@ -30,28 +30,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:paddingTop="53dip"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="#ff404040"
/>
<CheckBox android:id="@+id/zeroclick_checkbox"
android:layout_width="match_parent"
android:layout_height="64dip"
android:gravity="center_vertical"
android:text="@string/zeroclick_label"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
/>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="#ff404040"
/>
<TextView android:id="@+id/zeroclick_explained"
android:layout_width="match_parent"
android:layout_height="wrap_content"