diff options
author | Philip Milne <pmilne@google.com> | 2012-04-16 10:03:17 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-16 10:03:17 -0700 |
commit | 4e1cb3b7942d3ca05918604358b4ef83815ce448 (patch) | |
tree | 8c4d1b32367dda945548a3d1a1b895ad39a3ac03 /tests | |
parent | 7c886acf2e60d7f4a02197401d1d046ef3b870b4 (diff) | |
parent | 1557fd7809078e421f751efc7d2539b3efdc54b2 (diff) | |
download | frameworks_base-4e1cb3b7942d3ca05918604358b4ef83815ce448.zip frameworks_base-4e1cb3b7942d3ca05918604358b4ef83815ce448.tar.gz frameworks_base-4e1cb3b7942d3ca05918604358b4ef83815ce448.tar.bz2 |
Merge "Fix for bug 6110465."
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GridLayoutTest/AndroidManifest.xml | 7 | ||||
-rw-r--r-- | tests/GridLayoutTest/res/drawable/btn_default.xml | 33 | ||||
-rw-r--r-- | tests/GridLayoutTest/res/drawable/my_btn_default_normal.9.png | bin | 0 -> 1269 bytes | |||
-rwxr-xr-x | tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable.9.png | bin | 0 -> 3601 bytes | |||
-rwxr-xr-x | tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable_focused.9.png | bin | 0 -> 1781 bytes | |||
-rwxr-xr-x | tests/GridLayoutTest/res/drawable/my_btn_default_pressed.9.png | bin | 0 -> 1913 bytes | |||
-rwxr-xr-x | tests/GridLayoutTest/res/drawable/my_btn_default_selected.9.png | bin | 0 -> 1507 bytes | |||
-rw-r--r-- | tests/GridLayoutTest/res/layout/grid7.xml | 2 | ||||
-rw-r--r-- | tests/GridLayoutTest/src/com/android/test/layout/LayoutInsetsTest.java | 59 |
9 files changed, 100 insertions, 1 deletions
diff --git a/tests/GridLayoutTest/AndroidManifest.xml b/tests/GridLayoutTest/AndroidManifest.xml index 141e8fa..677220d 100644 --- a/tests/GridLayoutTest/AndroidManifest.xml +++ b/tests/GridLayoutTest/AndroidManifest.xml @@ -83,6 +83,13 @@ <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> + + <activity android:name="LayoutInsetsTest" android:label="LayoutInsetsTest"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> </application> diff --git a/tests/GridLayoutTest/res/drawable/btn_default.xml b/tests/GridLayoutTest/res/drawable/btn_default.xml new file mode 100644 index 0000000..c6cfda0 --- /dev/null +++ b/tests/GridLayoutTest/res/drawable/btn_default.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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. +--> + + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/my_btn_default_normal" /> + <item android:state_window_focused="false" android:state_enabled="false" + android:drawable="@drawable/my_btn_default_normal" /> + <item android:state_pressed="true" + android:drawable="@drawable/my_btn_default_pressed" /> + <item android:state_focused="true" android:state_enabled="true" + android:drawable="@drawable/my_btn_default_selected" /> + <item android:state_enabled="true" + android:drawable="@drawable/my_btn_default_normal" /> + <item android:state_focused="true" + android:drawable="@drawable/my_btn_default_normal_disable_focused" /> + <item + android:drawable="@drawable/my_btn_default_normal_disable" /> +</selector> diff --git a/tests/GridLayoutTest/res/drawable/my_btn_default_normal.9.png b/tests/GridLayoutTest/res/drawable/my_btn_default_normal.9.png Binary files differnew file mode 100644 index 0000000..cd0b7d5 --- /dev/null +++ b/tests/GridLayoutTest/res/drawable/my_btn_default_normal.9.png diff --git a/tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable.9.png b/tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable.9.png Binary files differnew file mode 100755 index 0000000..f4f01c7 --- /dev/null +++ b/tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable.9.png diff --git a/tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable_focused.9.png b/tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable_focused.9.png Binary files differnew file mode 100755 index 0000000..5376db2 --- /dev/null +++ b/tests/GridLayoutTest/res/drawable/my_btn_default_normal_disable_focused.9.png diff --git a/tests/GridLayoutTest/res/drawable/my_btn_default_pressed.9.png b/tests/GridLayoutTest/res/drawable/my_btn_default_pressed.9.png Binary files differnew file mode 100755 index 0000000..4312c27 --- /dev/null +++ b/tests/GridLayoutTest/res/drawable/my_btn_default_pressed.9.png diff --git a/tests/GridLayoutTest/res/drawable/my_btn_default_selected.9.png b/tests/GridLayoutTest/res/drawable/my_btn_default_selected.9.png Binary files differnew file mode 100755 index 0000000..06b7790 --- /dev/null +++ b/tests/GridLayoutTest/res/drawable/my_btn_default_selected.9.png diff --git a/tests/GridLayoutTest/res/layout/grid7.xml b/tests/GridLayoutTest/res/layout/grid7.xml index b9e58d7..0e5be0c 100644 --- a/tests/GridLayoutTest/res/layout/grid7.xml +++ b/tests/GridLayoutTest/res/layout/grid7.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - android:columnCount="2" + <Space android:layout_row="0" android:layout_column="0" diff --git a/tests/GridLayoutTest/src/com/android/test/layout/LayoutInsetsTest.java b/tests/GridLayoutTest/src/com/android/test/layout/LayoutInsetsTest.java new file mode 100644 index 0000000..74daccc --- /dev/null +++ b/tests/GridLayoutTest/src/com/android/test/layout/LayoutInsetsTest.java @@ -0,0 +1,59 @@ +package com.android.test.layout; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.GridLayout; +import android.widget.Space; +import android.widget.TextView; + +import static android.text.InputType.TYPE_CLASS_TEXT; +import static android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS; +import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD; +import static android.widget.GridLayout.*; +import static android.widget.GridLayout.FILL; +import static android.widget.GridLayout.spec; + +public class LayoutInsetsTest extends Activity { + public static View create(Context context) { + GridLayout p = new GridLayout(context); + p.setUseDefaultMargins(true); + p.setAlignmentMode(ALIGN_BOUNDS); + p.setOrientation(VERTICAL); + + { + TextView c = new TextView(context); + c.setTextSize(32); + c.setText("Email setup"); + p.addView(c); + } + { + Button c = new Button(context); + c.setBackgroundResource(R.drawable.btn_default); + c.setText("Manual setup"); + p.addView(c); + c.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Button b = (Button) v; + b.setEnabled(false); + } + }); + } + + return p; + } + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + //getApplicationInfo().targetSdkVersion = Build.VERSION_CODES.ICE_CREAM_SANDWICH; + getApplicationInfo().targetSdkVersion = Build.VERSION_CODES.JELLY_BEAN; + setContentView(create(this)); + } +} |