diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-12-17 16:27:23 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2010-12-20 17:28:40 +0800 |
| commit | 222cc95121fa2f645257e55f208d23558f570e65 (patch) | |
| tree | 2b3b0b703c5c29e1106b159a4296c6723872a893 /res/layout-xlarge | |
| parent | 1afe2a1ff266f1ccd7fccf2c37e97d2136384896 (diff) | |
| download | LegacyCamera-222cc95121fa2f645257e55f208d23558f570e65.zip LegacyCamera-222cc95121fa2f645257e55f208d23558f570e65.tar.gz LegacyCamera-222cc95121fa2f645257e55f208d23558f570e65.tar.bz2 | |
Use ListView for basic setting popup windows.
bug:3278543
Change-Id: I4a1a31113dd5614eabb6ed5ebb0b2857f930b135
Diffstat (limited to 'res/layout-xlarge')
| -rw-r--r-- | res/layout-xlarge/basic_setting_popup.xml | 24 | ||||
| -rw-r--r-- | res/layout-xlarge/setting_item.xml | 13 |
2 files changed, 11 insertions, 26 deletions
diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml index 47ea4a8..f1ffdd2 100644 --- a/res/layout-xlarge/basic_setting_popup.xml +++ b/res/layout-xlarge/basic_setting_popup.xml @@ -18,7 +18,7 @@ --> <com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" + android:layout_width="359dp" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentRight="true" @@ -33,20 +33,16 @@ <TextView android:id="@+id/title" style="@style/SettingTitleText" /> </FrameLayout> - <FrameLayout android:paddingTop="10dp" - android:layout_width="match_parent" + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/dialog_bottom_holo_dark"> - <ScrollView android:orientation="vertical" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_gravity="center" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - <LinearLayout android:id="@+id/contentPanel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" /> - </ScrollView> + <ListView android:id="@+id/contentPanel" + android:orientation="vertical" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:paddingBottom="3dp" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </FrameLayout> </com.android.camera.ui.BasicSettingPopup> diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-xlarge/setting_item.xml index 3db0f2d..da54ddc 100644 --- a/res/layout-xlarge/setting_item.xml +++ b/res/layout-xlarge/setting_item.xml @@ -17,25 +17,14 @@ */ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - <ImageView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/divider_horizontal_holo_dark" - android:scaleType="fitXY" /> - <LinearLayout android:id="@+id/setting_row" style="@style/SettingRow"> <TextView android:id="@+id/text" - style="@style/SettingPickerText" - android:textColor="@drawable/btn_setting_picker" /> + style="@style/SettingPickerText"/> <ImageView android:id="@+id/image" android:layout_width="35dp" android:layout_height="35dp" - android:layout_marginRight="35dp" android:gravity="center" android:scaleType="fitCenter" android:adjustViewBounds="true" /> - </LinearLayout> </LinearLayout> |