old mode 100755new mode 100644.. | .. |
---|
203 | 203 | loadSizes(); |
---|
204 | 204 | |
---|
205 | 205 | // Send loaded sizes to additional preferences. |
---|
206 | | - CameraSettingsActivityHelper.onSizesLoaded(this, mPictureSizes.backCameraSizes, |
---|
207 | | - new ListPreferenceFiller() { |
---|
208 | | - @Override |
---|
209 | | - public void fill(List<Size> sizes, ListPreference preference) { |
---|
210 | | - setEntriesForSelection(sizes, preference); |
---|
211 | | - } |
---|
212 | | - }); |
---|
| 206 | + if (!mPictureSizes.backCameraSizes.isEmpty()) { |
---|
| 207 | + CameraSettingsActivityHelper.onSizesLoaded(this, mPictureSizes.backCameraSizes, |
---|
| 208 | + new ListPreferenceFiller() { |
---|
| 209 | + @Override |
---|
| 210 | + public void fill(List<Size> sizes, ListPreference preference) { |
---|
| 211 | + setEntriesForSelection(sizes, preference); |
---|
| 212 | + } |
---|
| 213 | + }); |
---|
| 214 | + } else if (!mPictureSizes.frontCameraSizes.isEmpty()) { |
---|
| 215 | + CameraSettingsActivityHelper.onSizesLoaded(this, mPictureSizes.frontCameraSizes, |
---|
| 216 | + new ListPreferenceFiller() { |
---|
| 217 | + @Override |
---|
| 218 | + public void fill(List<Size> sizes, ListPreference preference) { |
---|
| 219 | + setEntriesForSelection(sizes, preference); |
---|
| 220 | + } |
---|
| 221 | + }); |
---|
| 222 | + } else { |
---|
| 223 | + CameraSettingsActivityHelper.onSizesLoaded(this, mPictureSizes.externalCameraSizes, |
---|
| 224 | + new ListPreferenceFiller() { |
---|
| 225 | + @Override |
---|
| 226 | + public void fill(List<Size> sizes, ListPreference preference) { |
---|
| 227 | + setEntriesForSelection(sizes, preference); |
---|
| 228 | + } |
---|
| 229 | + }); |
---|
| 230 | + } |
---|
213 | 231 | |
---|
214 | 232 | // Make sure to hide settings for cameras that don't exist on this |
---|
215 | 233 | // device. |
---|
.. | .. |
---|
309 | 327 | recursiveDelete(resolutions, |
---|
310 | 328 | findPreference(Keys.KEY_VIDEO_QUALITY_FRONT)); |
---|
311 | 329 | } |
---|
| 330 | + if (mPictureSizes.externalCameraSizes.isEmpty()) { |
---|
| 331 | + recursiveDelete(resolutions, |
---|
| 332 | + findPreference(Keys.KEY_PICTURE_SIZE_EXTERNAL)); |
---|
| 333 | + recursiveDelete(resolutions, |
---|
| 334 | + findPreference(Keys.KEY_VIDEO_QUALITY_EXTERNAL)); |
---|
| 335 | + } |
---|
312 | 336 | } |
---|
313 | 337 | |
---|
314 | 338 | /** |
---|
.. | .. |
---|
382 | 406 | setEntriesForSelection(mPictureSizes.backCameraSizes, listPreference); |
---|
383 | 407 | } else if (listPreference.getKey().equals(Keys.KEY_PICTURE_SIZE_FRONT)) { |
---|
384 | 408 | setEntriesForSelection(mPictureSizes.frontCameraSizes, listPreference); |
---|
| 409 | + } else if (listPreference.getKey().equals(Keys.KEY_PICTURE_SIZE_EXTERNAL)) { |
---|
| 410 | + setEntriesForSelection(mPictureSizes.externalCameraSizes, listPreference); |
---|
385 | 411 | } else if (listPreference.getKey().equals(Keys.KEY_VIDEO_QUALITY_BACK)) { |
---|
386 | 412 | setEntriesForSelection(mPictureSizes.videoQualitiesBack.orNull(), listPreference); |
---|
387 | 413 | } else if (listPreference.getKey().equals(Keys.KEY_VIDEO_QUALITY_FRONT)) { |
---|
388 | 414 | setEntriesForSelection(mPictureSizes.videoQualitiesFront.orNull(), listPreference); |
---|
| 415 | + } else if (listPreference.getKey().equals(Keys.KEY_VIDEO_QUALITY_EXTERNAL)) { |
---|
| 416 | + setEntriesForSelection(mPictureSizes.videoQualitiesExternal.orNull(), listPreference); |
---|
389 | 417 | } |
---|
390 | 418 | } |
---|
391 | 419 | |
---|
.. | .. |
---|
405 | 433 | } else if (listPreference.getKey().equals(Keys.KEY_PICTURE_SIZE_FRONT)) { |
---|
406 | 434 | setSummaryForSelection(mPictureSizes.frontCameraSizes, |
---|
407 | 435 | listPreference); |
---|
| 436 | + } else if (listPreference.getKey().equals(Keys.KEY_PICTURE_SIZE_EXTERNAL)) { |
---|
| 437 | + setSummaryForSelection(mPictureSizes.externalCameraSizes, |
---|
| 438 | + listPreference); |
---|
408 | 439 | } else if (listPreference.getKey().equals(Keys.KEY_VIDEO_QUALITY_BACK)) { |
---|
409 | 440 | setSummaryForSelection(mPictureSizes.videoQualitiesBack.orNull(), listPreference); |
---|
410 | 441 | } else if (listPreference.getKey().equals(Keys.KEY_VIDEO_QUALITY_FRONT)) { |
---|
411 | 442 | setSummaryForSelection(mPictureSizes.videoQualitiesFront.orNull(), listPreference); |
---|
| 443 | + } else if (listPreference.getKey().equals(Keys.KEY_VIDEO_QUALITY_EXTERNAL)) { |
---|
| 444 | + setSummaryForSelection(mPictureSizes.videoQualitiesExternal.orNull(), listPreference); |
---|
412 | 445 | } else { |
---|
413 | 446 | listPreference.setSummary(listPreference.getEntry()); |
---|
414 | 447 | } |
---|