diff options
author | Chih-Chung Chang <chihchung@google.com> | 2012-10-15 23:32:43 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-15 23:32:43 -0700 |
commit | c021a5879d5f790b4d4fc927d29aafca2fc43f8b (patch) | |
tree | 8e45ce6354b5e3e765070cb3e0674af70dde2b19 | |
parent | 25f4ee10f6a4ea9d8ffa6a1f3bdb1291ad813dd1 (diff) | |
parent | e9eceb552f80f8fb1e33b530ef18f1d0ae406408 (diff) | |
download | VideoEditor-c021a5879d5f790b4d4fc927d29aafca2fc43f8b.tar.gz |
am e9eceb55: am a727e385: am 19decbf6: Make the height of title template and transition selection dialog match_parent.
* commit 'e9eceb552f80f8fb1e33b530ef18f1d0ae406408':
Make the height of title template and transition selection dialog match_parent.
-rwxr-xr-x | res/layout-w320dp-port/list_view.xml | 23 | ||||
-rwxr-xr-x | res/layout-w320dp-port/transition_list_view.xml | 50 | ||||
-rwxr-xr-x | res/layout-w533dp-land/list_view.xml | 23 | ||||
-rwxr-xr-x | res/layout-w533dp-land/transition_list_view.xml | 50 | ||||
-rwxr-xr-x | res/layout/list_view.xml | 15 | ||||
-rwxr-xr-x | res/layout/transition_list_view.xml | 2 |
6 files changed, 6 insertions, 157 deletions
diff --git a/res/layout-w320dp-port/list_view.xml b/res/layout-w320dp-port/list_view.xml deleted file mode 100755 index 741843d..0000000 --- a/res/layout-w320dp-port/list_view.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 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. ---> - -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="400dip" - android:drawSelectorOnTop="false" - android:cacheColorHint="#00000000"/> diff --git a/res/layout-w320dp-port/transition_list_view.xml b/res/layout-w320dp-port/transition_list_view.xml deleted file mode 100755 index bb10654..0000000 --- a/res/layout-w320dp-port/transition_list_view.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="430dip"> - <ListView - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1.0" - android:drawSelectorOnTop="false" - android:cacheColorHint="#00000000"/> - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:background="#20404040"> - <ImageButton android:id="@+id/duration_left" - android:onClick="onClickHandler" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/btn_arrow_left"/> - <TextView android:id="@+id/transition_duration" - android:layout_width="100dip" - android:layout_height="match_parent" - android:gravity="center"/> - <ImageButton android:id="@+id/duration_right" - android:onClick="onClickHandler" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/btn_arrow_right"/> - </LinearLayout> -</LinearLayout> diff --git a/res/layout-w533dp-land/list_view.xml b/res/layout-w533dp-land/list_view.xml deleted file mode 100755 index d4f5c29..0000000 --- a/res/layout-w533dp-land/list_view.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 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. ---> - -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="250dip" - android:drawSelectorOnTop="false" - android:cacheColorHint="#00000000"/> diff --git a/res/layout-w533dp-land/transition_list_view.xml b/res/layout-w533dp-land/transition_list_view.xml deleted file mode 100755 index 43f1f2a..0000000 --- a/res/layout-w533dp-land/transition_list_view.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2010 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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="250dip"> - <ListView - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1.0" - android:drawSelectorOnTop="false" - android:cacheColorHint="#00000000"/> - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:background="#20404040"> - <ImageButton android:id="@+id/duration_left" - android:onClick="onClickHandler" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/btn_arrow_left"/> - <TextView android:id="@+id/transition_duration" - android:layout_width="100dip" - android:layout_height="match_parent" - android:gravity="center"/> - <ImageButton android:id="@+id/duration_right" - android:onClick="onClickHandler" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/btn_arrow_right"/> - </LinearLayout> -</LinearLayout> diff --git a/res/layout/list_view.xml b/res/layout/list_view.xml index 930bbd8..4fe804a 100755 --- a/res/layout/list_view.xml +++ b/res/layout/list_view.xml @@ -15,14 +15,9 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/list" android:layout_width="match_parent" - android:layout_height="500dip"> - <ListView - android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:drawSelectorOnTop="false" - android:cacheColorHint="#00000000"/> -</LinearLayout> + android:layout_height="match_parent" + android:drawSelectorOnTop="false" + android:cacheColorHint="#00000000"/> diff --git a/res/layout/transition_list_view.xml b/res/layout/transition_list_view.xml index 2b9207e..07d57ad 100755 --- a/res/layout/transition_list_view.xml +++ b/res/layout/transition_list_view.xml @@ -18,7 +18,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="500dip"> + android:layout_height="match_parent"> <ListView android:id="@android:id/list" android:layout_width="match_parent" |