Merge "Update BiDiTest app for testing View padding" (9171bf38) · Commits · e / os / android_frameworks_base

tests/BiDiTests/res/layout/view_padding.xml

0 → 100644

+156 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/view_padding"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent">

		<FrameLayout android:layout_width="match_parent"
		android:layout_height="match_parent">

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="top\|left"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="top\|center_horizontal"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="inherit">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="top\|right"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="ltr">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="bottom\|left"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="rtl">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		<FrameLayout
		android:layout_width="300dp"
		android:layout_height="300dp"
		android:layout_gravity="bottom\|center_horizontal"
		android:background="#FF888888"
		android:paddingTop="20dip"
		android:paddingLeft="40dip"
		android:paddingBottom="30dip"
		android:paddingRight="50dip"
		android:layoutDirection="locale">

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="top\|left"
		android:background="#FF0000FF">
		</FrameLayout>

		<FrameLayout
		android:layout_width="100dp"
		android:layout_height="100dp"
		android:layout_gravity="bottom\|right"
		android:background="#FF00FF00">
		</FrameLayout>
		</FrameLayout>

		</FrameLayout>

		</FrameLayout>

tests/BiDiTests/src/com/android/bidi/BiDiTestActivity.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,8 @@ public class BiDiTestActivity extends Activity {
		addItem(result, "Table RTL", BiDiTestTableLayoutRtl.class, R.id.table_layout_rtl);
		addItem(result, "Table LOC", BiDiTestTableLayoutLocale.class, R.id.table_layout_locale);

		addItem(result, "ViewPadding", BiDiTestViewPadding.class, R.id.view_padding);

		return result;
		}
		}
		No newline at end of file

tests/BiDiTests/src/com/android/bidi/BiDiTestViewPadding.java

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		// Copyright 2011 Google Inc. All Rights Reserved.
		package com.android.bidi;

		import android.app.Fragment;
		import android.os.Bundle;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;

		public class BiDiTestViewPadding extends Fragment {

		@Override
		public View onCreateView(LayoutInflater inflater, ViewGroup container,
		Bundle savedInstanceState) {
		return inflater.inflate(R.layout.view_padding, container, false);
		}
		}