Merge from head.

2010-12-31 09:14:09 -08:00
parent b961356b7b
commit 868c1ef891
7 changed files with 365 additions and 236 deletions
@@ -30,13 +30,15 @@ limitations under the License.
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
+    android:padding="10dip"
    android:layout_weight="0">
    <ZoomControls android:id="@+id/elevation_zoom"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_gravity="center_horizontal"
      android:layout_alignParentBottom="true"
-      android:layout_centerHorizontal="true"/>
+      android:layout_centerHorizontal="true"
+      android:layout_alignParentRight="true"/>
  </RelativeLayout>
  <LinearLayout android:id="@+id/elevation_busypane"
    android:orientation="vertical"