PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 50c7f2d9: merge from open-source master

Browse Source 
Merge commit '50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken

* commit '50c7f2d92a8100982c49027058fb05069e4a1e2a':
  A button in the master clear information screen was partly hidden.
This commit is contained in:
The Android Open Source Project
2010-05-19 09:14:10 -07:00
committed by Android Git Automerger
parent 3f253cf2d7 50c7f2d92a
commit b6c756d521
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/master_clear_primary.xml
View File

@@ -17,20 +17,24 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/info_layout"> style="@style/info_layout">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp" android:textSize="18sp"
android:text="@string/master_clear_desc" /> android:text="@string/master_clear_desc" />
</ScrollView>
<Button android:id="@+id/initiate_master_clear" <Button
android:id="@+id/initiate_master_clear"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="40dip" android:layout_marginTop="20dip"
android:layout_width="150dip" android:layout_width="150dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/master_clear_button_text" android:text="@string/master_clear_button_text"