diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2013-10-26 18:42:50 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-10-27 10:15:53 +0000 |
| commit | 6a221254c7e63d8a0404ade091d8612732875345 (patch) | |
| tree | e89ec35f0304a3a27f5eda5434d72d55f3b37aa6 /src/com/android/camera/PhotoMenu.java | |
| parent | 4b0cc9ed6e036272bdff481a8138a951430279ee (diff) | |
| download | android_packages_apps_Gallery2-6a221254c7e63d8a0404ade091d8612732875345.tar.gz android_packages_apps_Gallery2-6a221254c7e63d8a0404ade091d8612732875345.tar.bz2 android_packages_apps_Gallery2-6a221254c7e63d8a0404ade091d8612732875345.zip | |
Camera: Move storage settings under second menu
Fix layout issues like this: http://i.imgur.com/XvJz5Pk.png
Change-Id: Ia641cc524266eef0edbcce851707b1a48b1490bd
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index db49efbf1..0bfc075cb 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -162,27 +162,6 @@ public class PhotoMenu extends PieController }); more.addItem(item); } - // Storage location - if (group.findPreference(CameraSettings.KEY_STORAGE) != null) { - item = makeItem(R.drawable.stat_notify_sdcard); - final ListPreference storagePref = group.findPreference(CameraSettings.KEY_STORAGE); - item.setLabel(res.getString(R.string.pref_camera_storage_title).toUpperCase(locale)); - item.setOnClickListener(new OnClickListener() { - @Override - public void onClick(PieItem item) { - LayoutInflater inflater = mActivity.getLayoutInflater(); - ListPrefSettingPopup popup = (ListPrefSettingPopup) inflater.inflate( - R.layout.list_pref_setting_popup, null, false); - popup.initialize(storagePref); - popup.setSettingChangedListener(PhotoMenu.this); - mUI.dismissPopup(); - mPopup = popup; - mPopupStatus = POPUP_SECOND_LEVEL; - mUI.showPopup(mPopup); - } - }); - more.addItem(item); - } // white balance if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) { item = makeItem(CameraSettings.KEY_WHITE_BALANCE); @@ -212,6 +191,7 @@ public class PhotoMenu extends PieController } // extra settings popup mOtherKeys = new String[] { + CameraSettings.KEY_STORAGE, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_FOCUS_TIME, CameraSettings.KEY_POWER_SHUTTER, |