diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-01-07 21:28:58 +0100 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2015-01-21 16:57:12 +0100 |
commit | 397ca8be8de407237cd293873647c182837bc032 (patch) | |
tree | 4b7db1011b1fcc25b09e3ae31cdddb897d1588d2 /core/tests | |
parent | b93024f1e8676c3b964cca6f86c9c7056da37d88 (diff) | |
download | frameworks_base-397ca8be8de407237cd293873647c182837bc032.zip frameworks_base-397ca8be8de407237cd293873647c182837bc032.tar.gz frameworks_base-397ca8be8de407237cd293873647c182837bc032.tar.bz2 |
Remove dead code #11: Remove more unused classes
Change-Id: I3130991cb468a47aa0e198e42f20edca0836f66b
Diffstat (limited to 'core/tests')
15 files changed, 0 insertions, 1118 deletions
diff --git a/core/tests/coretests/res/layout/size_adaptive.xml b/core/tests/coretests/res/layout/size_adaptive.xml deleted file mode 100644 index 03d0574..0000000 --- a/core/tests/coretests/res/layout/size_adaptive.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/multi1" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_color.xml b/core/tests/coretests/res/layout/size_adaptive_color.xml deleted file mode 100644 index cdb7a59..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_color.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:background="#ffffff" - android:id="@+id/multi1" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_color_statelist.xml b/core/tests/coretests/res/layout/size_adaptive_color_statelist.xml deleted file mode 100644 index d24df5b..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_color_statelist.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:background="@drawable/size_adaptive_statelist" - android:id="@+id/multi1" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_four_u.xml b/core/tests/coretests/res/layout/size_adaptive_four_u.xml deleted file mode 100644 index 232b921..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_four_u.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/gridLayout4" - android:layout_width="match_parent" - android:layout_height="256dp" - android:background="#000000" - android:columnCount="2" - android:padding="1dp" > - - <ImageView - android:id="@+id/actor" - android:layout_width="62dp" - android:layout_height="62dp" - android:layout_row="0" - android:layout_column="0" - android:layout_rowSpan="2" - android:contentDescription="@string/actor" - android:src="@drawable/abe" /> - - <TextView - android:layout_width="0dp" - android:id="@+id/name" - android:layout_row="0" - android:layout_column="1" - android:layout_gravity="fill_horizontal" - android:padding="3dp" - android:text="@string/actor" - android:textColor="#ffffff" - android:textStyle="bold" /> - - <ImageView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_row="1" - android:layout_column="1" - android:layout_gravity="fill_horizontal" - android:padding="5dp" - android:adjustViewBounds="true" - android:background="#555555" - android:scaleType="centerCrop" - android:src="@drawable/gettysburg" - android:contentDescription="@string/caption" /> - - <TextView - android:layout_width="0dp" - android:id="@+id/note" - android:layout_row="2" - android:layout_column="1" - android:layout_gravity="fill_horizontal" - android:padding="3dp" - android:singleLine="true" - android:text="@string/first" - android:textColor="#ffffff" /> -</GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_four_u_text.xml b/core/tests/coretests/res/layout/size_adaptive_four_u_text.xml deleted file mode 100644 index 93a10de..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_four_u_text.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/gridLayout4" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#000000" - android:columnCount="2" - android:padding="1dp" - android:orientation="horizontal" > - - <ImageView - android:id="@+id/actor" - android:layout_width="62dp" - android:layout_height="62dp" - android:layout_row="0" - android:layout_column="0" - android:layout_rowSpan="2" - android:contentDescription="@string/actor" - android:src="@drawable/abe" /> - - <TextView - android:layout_width="0dp" - android:id="@+id/name" - android:layout_row="0" - android:layout_column="1" - android:layout_gravity="fill_horizontal" - android:padding="3dp" - android:text="@string/actor" - android:textColor="#ffffff" - android:textStyle="bold" /> - - <TextView - android:id="@+id/note" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_column="1" - android:layout_gravity="fill_horizontal" - android:layout_marginTop="5dp" - android:layout_row="1" - android:padding="3dp" - android:singleLine="false" - android:text="@string/first" - android:textColor="#ffffff" /> - - </GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_gappy.xml b/core/tests/coretests/res/layout/size_adaptive_gappy.xml deleted file mode 100644 index d5e3b41..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_gappy.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/multi_with_gap" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="256dp" - internal:layout_minHeight="128dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_large_only.xml b/core/tests/coretests/res/layout/size_adaptive_large_only.xml deleted file mode 100644 index cf58265..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_large_only.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/large_only_multi" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="256dp" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_lies.xml b/core/tests/coretests/res/layout/size_adaptive_lies.xml deleted file mode 100644 index 7de892e..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_lies.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/multi1" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_one_u.xml b/core/tests/coretests/res/layout/size_adaptive_one_u.xml deleted file mode 100644 index b6fe4a0..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_one_u.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/gridLayout1" - android:layout_width="match_parent" - android:layout_height="64dp" - android:background="#000000" - android:columnCount="3" - android:padding="1dp" - android:rowCount="2" > - - <ImageView - android:id="@+id/actor" - android:layout_width="62dp" - android:layout_height="62dp" - android:layout_column="0" - android:layout_row="0" - android:layout_rowSpan="2" - android:contentDescription="@string/actor" - android:src="@drawable/abe" /> - - <TextView - android:id="@+id/name" - android:layout_gravity="fill" - android:padding="3dp" - android:text="@string/actor" - android:textColor="#ffffff" - android:textStyle="bold" /> - - <ImageView - android:layout_width="62dp" - android:layout_height="62dp" - android:layout_gravity="fill_vertical" - android:layout_rowSpan="2" - android:adjustViewBounds="true" - android:background="#555555" - android:padding="2dp" - android:scaleType="fitXY" - android:src="@drawable/gettysburg" - android:contentDescription="@string/caption" /> - - <TextView - android:id="@+id/note" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_gravity="fill" - android:layout_marginTop="5dp" - android:padding="3dp" - android:singleLine="true" - android:text="@string/first" - android:textColor="#ffffff" /> - -</GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_one_u_text.xml b/core/tests/coretests/res/layout/size_adaptive_one_u_text.xml deleted file mode 100644 index df54eb6..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_one_u_text.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/gridLayout1" - android:layout_width="match_parent" - android:layout_height="64dp" - android:background="#000000" - android:columnCount="2" - android:padding="1dp" - android:rowCount="2" > - - <ImageView - android:id="@+id/actor" - android:layout_width="62dp" - android:layout_height="62dp" - android:layout_column="0" - android:layout_row="0" - android:layout_rowSpan="2" - android:contentDescription="@string/actor" - android:src="@drawable/abe" /> - - <TextView - android:id="@+id/name" - android:layout_gravity="fill" - android:padding="3dp" - android:text="@string/actor" - android:textColor="#ffffff" - android:textStyle="bold" /> - - <TextView - android:id="@+id/note" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_gravity="fill" - android:layout_marginTop="5dp" - android:padding="3dp" - android:singleLine="true" - android:text="@string/first" - android:textColor="#ffffff" /> - -</GridLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_overlapping.xml b/core/tests/coretests/res/layout/size_adaptive_overlapping.xml deleted file mode 100644 index 4abe8b0..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_overlapping.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/multi_with_overlap" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="256dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="256dp"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_singleton.xml b/core/tests/coretests/res/layout/size_adaptive_singleton.xml deleted file mode 100644 index eba387f..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_singleton.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u_text" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_text.xml b/core/tests/coretests/res/layout/size_adaptive_text.xml deleted file mode 100644 index a9f0ba9..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_text.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/multi1" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u_text" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u_text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/res/layout/size_adaptive_three_way.xml b/core/tests/coretests/res/layout/size_adaptive_three_way.xml deleted file mode 100644 index 1eb5396..0000000 --- a/core/tests/coretests/res/layout/size_adaptive_three_way.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 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. ---> -<com.android.internal.widget.SizeAdaptiveLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:internal="http://schemas.android.com/apk/prv/res/android" - android:id="@+id/three_way_multi" - android:layout_width="match_parent" - android:layout_height="64dp" > - - <include - android:id="@+id/one_u" - layout="@layout/size_adaptive_one_u" - android:layout_width="fill_parent" - android:layout_height="64dp" - internal:layout_minHeight="64dp" - internal:layout_maxHeight="64dp" - /> - - <include - android:id="@+id/two_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="128dp" - internal:layout_minHeight="65dp" - internal:layout_maxHeight="128dp"/> - - <include - android:id="@+id/four_u" - layout="@layout/size_adaptive_four_u" - android:layout_width="fill_parent" - android:layout_height="256dp" - internal:layout_minHeight="129dp" - internal:layout_maxHeight="unbounded"/> - -</com.android.internal.widget.SizeAdaptiveLayout> diff --git a/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java b/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java deleted file mode 100644 index 18411b0..0000000 --- a/core/tests/coretests/src/com/android/internal/widget/SizeAdaptiveLayoutTest.java +++ /dev/null @@ -1,479 +0,0 @@ -/* - * Copyright (C) 2012 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. - */ - -package com.android.internal.widget; - -import com.android.frameworks.coretests.R; - -import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.view.LayoutInflater; -import android.view.View; - -import com.android.internal.widget.SizeAdaptiveLayout; - - -public class SizeAdaptiveLayoutTest extends AndroidTestCase { - - private LayoutInflater mInflater; - private int mOneU; - private int mFourU; - private SizeAdaptiveLayout mSizeAdaptiveLayout; - private View mSmallView; - private View mMediumView; - private View mLargeView; - - @Override - protected void setUp() throws Exception { - super.setUp(); - - // inflate the layout - final Context context = getContext(); - mInflater = LayoutInflater.from(context); - mOneU = 64; - mFourU = 4 * mOneU; - } - - private void inflate(int resource){ - mSizeAdaptiveLayout = (SizeAdaptiveLayout) mInflater.inflate(resource, null); - mSizeAdaptiveLayout.onAttachedToWindow(); - - mSmallView = mSizeAdaptiveLayout.findViewById(R.id.one_u); - mMediumView = mSizeAdaptiveLayout.findViewById(R.id.two_u); - mLargeView = mSizeAdaptiveLayout.findViewById(R.id.four_u); - } - - /** - * The name 'test preconditions' is a convention to signal that if this - * test doesn't pass, the test case was not set up properly and it might - * explain any and all failures in other tests. This is not guaranteed - * to run before other tests, as junit uses reflection to find the tests. - */ - @SmallTest - public void testPreconditions() { - assertNotNull(mInflater); - - inflate(R.layout.size_adaptive); - assertNotNull(mSizeAdaptiveLayout); - assertNotNull(mSmallView); - assertNotNull(mLargeView); - } - - @SmallTest - public void testOpenLarge() { - inflate(R.layout.size_adaptive); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.minHeight + 10; - - measureAndLayout(height); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - assertEquals("1U should be gone", - View.GONE, - mSmallView.getVisibility()); - } - - @SmallTest - public void testOpenSmall() { - inflate(R.layout.size_adaptive); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - assertEquals("4U should be gone", - View.GONE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenTooSmall() { - inflate(R.layout.size_adaptive); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.minHeight - 10; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - assertEquals("4U should be gone", - View.GONE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenTooBig() { - inflate(R.layout.size_adaptive); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - lp.maxHeight = 500; - mLargeView.setLayoutParams(lp); - int height = (int) (lp.minHeight + 10); - - measureAndLayout(height); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - assertEquals("1U should be gone", - View.GONE, - mSmallView.getVisibility()); - } - - @SmallTest - public void testOpenWrapContent() { - inflate(R.layout.size_adaptive_text); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.minHeight + 10; - - // manually measure it, and lay it out - int measureSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.AT_MOST); - mSizeAdaptiveLayout.measure(500, measureSpec); - assertTrue("should not be forced to 4U", - mSizeAdaptiveLayout.getMeasuredHeight() < mFourU); - } - - @SmallTest - public void testOpenOneUOnlySmall() { - inflate(R.layout.size_adaptive_singleton); - assertNull("largeView should be NULL in the singleton layout", mLargeView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.minHeight - 10; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - } - - @SmallTest - public void testOpenOneUOnlyLarge() { - inflate(R.layout.size_adaptive_singleton); - assertNull("largeView should be NULL in the singleton layout", mLargeView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.maxHeight + 10; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - } - - @SmallTest - public void testOpenOneUOnlyJustRight() { - inflate(R.layout.size_adaptive_singleton); - assertNull("largeView should be NULL in the singleton layout", mLargeView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - } - - @SmallTest - public void testOpenFourUOnlySmall() { - inflate(R.layout.size_adaptive_large_only); - assertNull("smallView should be NULL in the singleton layout", mSmallView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.minHeight - 10; - - measureAndLayout(height); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenFourUOnlyLarge() { - inflate(R.layout.size_adaptive_large_only); - assertNull("smallView should be NULL in the singleton layout", mSmallView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.maxHeight + 10; - - measureAndLayout(height); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenFourUOnlyJustRight() { - inflate(R.layout.size_adaptive_large_only); - assertNull("smallView should be NULL in the singleton layout", mSmallView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenIntoAGap() { - inflate(R.layout.size_adaptive_gappy); - - SizeAdaptiveLayout.LayoutParams smallParams = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - SizeAdaptiveLayout.LayoutParams largeParams = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - assertTrue("gappy layout should have a gap", - smallParams.maxHeight + 10 < largeParams.minHeight); - int height = (int) smallParams.maxHeight + 10; - - measureAndLayout(height); - - assertTrue("one and only one view should be visible", - mLargeView.getVisibility() != mSmallView.getVisibility()); - // behavior is undefined in this case. - } - - @SmallTest - public void testOpenIntoAnOverlap() { - inflate(R.layout.size_adaptive_overlapping); - - SizeAdaptiveLayout.LayoutParams smallParams = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - SizeAdaptiveLayout.LayoutParams largeParams = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - assertEquals("overlapping layout should overlap", - smallParams.minHeight, - largeParams.minHeight); - int height = (int) smallParams.maxHeight; - - measureAndLayout(height); - - assertTrue("one and only one view should be visible", - mLargeView.getVisibility() != mSmallView.getVisibility()); - assertEquals("1U should get priority in an overlap because it is first", - View.VISIBLE, - mSmallView.getVisibility()); - } - - @SmallTest - public void testOpenThreeWayViewSmall() { - inflate(R.layout.size_adaptive_three_way); - assertNotNull("mMediumView should not be NULL in the three view layout", mMediumView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - assertEquals("2U should be gone", - View.GONE, - mMediumView.getVisibility()); - assertEquals("4U should be gone", - View.GONE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenThreeWayViewMedium() { - inflate(R.layout.size_adaptive_three_way); - assertNotNull("mMediumView should not be NULL in the three view layout", mMediumView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mMediumView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("1U should be gone", - View.GONE, - mSmallView.getVisibility()); - assertEquals("2U should be visible", - View.VISIBLE, - mMediumView.getVisibility()); - assertEquals("4U should be gone", - View.GONE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testOpenThreeWayViewLarge() { - inflate(R.layout.size_adaptive_three_way); - assertNotNull("mMediumView should not be NULL in the three view layout", mMediumView); - - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("1U should be gone", - View.GONE, - mSmallView.getVisibility()); - assertEquals("2U should be gone", - View.GONE, - mMediumView.getVisibility()); - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - } - - @SmallTest - public void testResizeWithoutAnimation() { - inflate(R.layout.size_adaptive); - - SizeAdaptiveLayout.LayoutParams largeParams = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int startHeight = (int) largeParams.minHeight + 10; - int endHeight = (int) largeParams.minHeight + 10; - - measureAndLayout(startHeight); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - assertFalse("There should be no animation on initial rendering.", - mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); - - measureAndLayout(endHeight); - - assertEquals("4U should still be visible", - View.VISIBLE, - mLargeView.getVisibility()); - assertFalse("There should be no animation on scale within a view.", - mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); - } - - @SmallTest - public void testResizeWithAnimation() { - inflate(R.layout.size_adaptive); - - SizeAdaptiveLayout.LayoutParams smallParams = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - SizeAdaptiveLayout.LayoutParams largeParams = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int startHeight = (int) largeParams.minHeight + 10; - int endHeight = (int) smallParams.maxHeight; - - measureAndLayout(startHeight); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - assertFalse("There should be no animation on initial rendering.", - mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); - - measureAndLayout(endHeight); - - assertEquals("1U should now be visible", - View.VISIBLE, - mSmallView.getVisibility()); - assertTrue("There should be an animation on scale between views.", - mSizeAdaptiveLayout.getTransitionAnimation().isRunning()); - } - - @SmallTest - public void testModestyPanelChangesColorWhite() { - inflate(R.layout.size_adaptive_color); - View panel = mSizeAdaptiveLayout.getModestyPanel(); - assertTrue("ModestyPanel should have a ColorDrawable background", - panel.getBackground() instanceof ColorDrawable); - ColorDrawable panelColor = (ColorDrawable) panel.getBackground(); - ColorDrawable salColor = (ColorDrawable) mSizeAdaptiveLayout.getBackground(); - assertEquals("ModestyPanel color should match the SizeAdaptiveLayout", - panelColor.getColor(), salColor.getColor()); - } - - @SmallTest - public void testModestyPanelTracksStateListColor() { - inflate(R.layout.size_adaptive_color_statelist); - View panel = mSizeAdaptiveLayout.getModestyPanel(); - assertEquals("ModestyPanel should have a ColorDrawable background" , - panel.getBackground().getClass(), ColorDrawable.class); - ColorDrawable panelColor = (ColorDrawable) panel.getBackground(); - assertEquals("ModestyPanel color should match the SizeAdaptiveLayout", - panelColor.getColor(), Color.RED); - } - @SmallTest - public void testOpenSmallEvenWhenLargeIsActuallySmall() { - inflate(R.layout.size_adaptive_lies); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mSmallView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("1U should be visible", - View.VISIBLE, - mSmallView.getVisibility()); - assertTrue("1U should also have been measured", - mSmallView.getMeasuredHeight() > 0); - } - - @SmallTest - public void testOpenLargeEvenWhenLargeIsActuallySmall() { - inflate(R.layout.size_adaptive_lies); - SizeAdaptiveLayout.LayoutParams lp = - (SizeAdaptiveLayout.LayoutParams) mLargeView.getLayoutParams(); - int height = (int) lp.minHeight; - - measureAndLayout(height); - - assertEquals("4U should be visible", - View.VISIBLE, - mLargeView.getVisibility()); - assertTrue("4U should also have been measured", - mLargeView.getMeasuredHeight() > 0); - } - - private void measureAndLayout(int height) { - // manually measure it, and lay it out - int measureSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.AT_MOST); - mSizeAdaptiveLayout.measure(500, measureSpec); - mSizeAdaptiveLayout.layout(0, 0, 500, mSizeAdaptiveLayout.getMeasuredHeight()); - } -} |