Commit d14c0ea2 authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "Fix assets and layout for popup window" into ics-mr1

parents 897b8838 4e29b3db
......@@ -14,34 +14,29 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/subwindow_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<FrameLayout
android:layout_height="match_parent"
android:background="@android:drawable/dialog_frame" >
<LinearLayout
android:id="@+id/inner_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dip" >
<LinearLayout
android:id="@+id/inner_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@android:drawable/dialog_frame" >
</LinearLayout>
</FrameLayout>
android:orientation="vertical" >
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="right"
android:background="@color/black"
android:gravity="right" >
<ImageButton android:id="@+id/subwindow_close"
android:focusable="true"
android:padding="0dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:drawable/btn_default"
android:src="@android:drawable/ic_menu_close_clear_cancel" />
style="@style/HoloButton"
android:src="@drawable/ic_close_window_holo_dark" />
</LinearLayout>
</RelativeLayout>
</FrameLayout>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment