diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-19 09:14:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-19 09:14:10 -0700 |
| commit | b6c756d5216d3f402f1d433c0781064416bed292 (patch) | |
| tree | b3c0f18aa86effc6255c5826fd2a8554e1be95bb | |
| parent | 3f253cf2d7830487c8e3f3acfa9d87665c97ea62 (diff) | |
| parent | 50c7f2d92a8100982c49027058fb05069e4a1e2a (diff) | |
| download | packages_apps_Settings-b6c756d5216d3f402f1d433c0781064416bed292.zip packages_apps_Settings-b6c756d5216d3f402f1d433c0781064416bed292.tar.gz packages_apps_Settings-b6c756d5216d3f402f1d433c0781064416bed292.tar.bz2 | |
am 50c7f2d9: merge from open-source master
Merge commit '50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken
* commit '50c7f2d92a8100982c49027058fb05069e4a1e2a':
A button in the master clear information screen was partly hidden.
| -rw-r--r-- | res/layout/master_clear_primary.xml | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/res/layout/master_clear_primary.xml b/res/layout/master_clear_primary.xml index ffac171..2c4156b 100644 --- a/res/layout/master_clear_primary.xml +++ b/res/layout/master_clear_primary.xml @@ -17,23 +17,27 @@ ** limitations under the License. */ --> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/info_layout"> + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/info_layout"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="18sp" - android:text="@string/master_clear_desc" /> + <ScrollView + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/master_clear_desc" /> + </ScrollView> + <Button + android:id="@+id/initiate_master_clear" + android:layout_gravity="center_horizontal" + android:layout_marginTop="20dip" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:text="@string/master_clear_button_text" + android:gravity="center" /> - <Button android:id="@+id/initiate_master_clear" - android:layout_gravity="center_horizontal" - android:layout_marginTop="40dip" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:text="@string/master_clear_button_text" - android:gravity="center" /> - </LinearLayout> |