diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-01-25 19:29:28 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 19:29:28 -0800 |
commit | 14afb74921954d8d54d07be05b0abc7105f5bc8f (patch) | |
tree | 2853b295fd00d88ae3507b1b84e5a82d5000f41d /res | |
parent | 5ef59c58e2a6b1e426a54f37d9d798989d85f96d (diff) | |
parent | 89042609715b696e8ed6bbc7e6ed8f582d480fbe (diff) | |
download | LegacyCamera-14afb74921954d8d54d07be05b0abc7105f5bc8f.zip LegacyCamera-14afb74921954d8d54d07be05b0abc7105f5bc8f.tar.gz LegacyCamera-14afb74921954d8d54d07be05b0abc7105f5bc8f.tar.bz2 |
am 89042609: am de0d58c0: Merge "Fix NPE in BasicSettingPopup." into honeycomb
* commit '89042609715b696e8ed6bbc7e6ed8f582d480fbe':
Fix NPE in BasicSettingPopup.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge/basic_setting_popup.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml index d18dae2..9be5ada 100644 --- a/res/layout-xlarge/basic_setting_popup.xml +++ b/res/layout-xlarge/basic_setting_popup.xml @@ -43,6 +43,7 @@ android:paddingBottom="3dp" android:layout_gravity="center" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:choiceMode="singleChoice" /> </FrameLayout> </com.android.camera.ui.BasicSettingPopup> |