OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoMerge "Move display orientation calculations out of app code" into ub-camera-glacier
Sol Boucher [Fri, 8 Aug 2014 00:20:57 +0000 (00:20 +0000)]
Merge "Move display orientation calculations out of app code" into ub-camera-glacier

9 years agorollback of b/16632474 and ag/518674
Spike Sprague [Thu, 7 Aug 2014 21:56:27 +0000 (14:56 -0700)]
rollback of b/16632474 and ag/518674

Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4

9 years agoMerge "fix NPE in action switch" into ub-camera-glacier
Alan Newberger [Wed, 6 Aug 2014 21:56:23 +0000 (21:56 +0000)]
Merge "fix NPE in action switch" into ub-camera-glacier

9 years agofix NPE in action switch
Alan Newberger [Wed, 6 Aug 2014 21:05:31 +0000 (14:05 -0700)]
fix NPE in action switch

Recent conversion of action condition from if/else to switch
overlooked need for switch to be non-null. Fixing here.

Bug: 16847376
Change-Id: I919c585c414d0d3c4ef7fcdefccfda9118ef8104

9 years agoupdate system ui flags for full screen on android L
Spike Sprague [Wed, 6 Aug 2014 19:13:00 +0000 (12:13 -0700)]
update system ui flags for full screen on android L

bug: 16632474
Change-Id: I5b555492587df103b41ad13a6893a334b8c71b68

9 years agoMerge "[OC] Enable flash support." into ub-camera-glacier
Sascha Haeberling [Tue, 5 Aug 2014 23:09:19 +0000 (23:09 +0000)]
Merge "[OC] Enable flash support." into ub-camera-glacier

9 years ago[OC] Migrate away from android.util.Size sinc we cannot use it in K.
Sascha Haeberling [Tue, 5 Aug 2014 22:54:42 +0000 (15:54 -0700)]
[OC] Migrate away from android.util.Size sinc we cannot use it in K.

  Bug: 16654225

Change-Id: I2c0ea6b387b8ad38d6e49c84dca8bf2bde34e249

9 years ago[OC] Enable flash support.
Sascha Haeberling [Thu, 31 Jul 2014 18:36:58 +0000 (11:36 -0700)]
[OC] Enable flash support.

  Bug: 16654225

Also show an error and exit the app if camera could not be opened.

Change-Id: Iddccaff35b081ba98efe2aaae51d9ee10bb7726f

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 5 Aug 2014 01:26:07 +0000 (18:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iefb086b8135a5efef30d53c06147a6415f824fb8
Auto-generated-cl: translation import

9 years agoMerge "[OC] Introduce OneCameraCreator so we can dynamically create a different versi...
Sascha Haeberling [Sun, 3 Aug 2014 04:44:00 +0000 (04:44 +0000)]
Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier

9 years ago[OC] Introduce OneCameraCreator so we can dynamically create a different version.
Sascha Haeberling [Sun, 3 Aug 2014 04:15:26 +0000 (21:15 -0700)]
[OC] Introduce OneCameraCreator so we can dynamically create a different version.

   Bug: 16654225

Change-Id: Iaf7d738b4405fa2e58cc5fc8af99d5ff2718f5a9

9 years agoMerge "Prevent monkey crash when deleting without data" into ub-camera-glacier
Sascha Haeberling [Sun, 3 Aug 2014 04:16:45 +0000 (04:16 +0000)]
Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier

9 years agoRestore grid initialization logic to fix grid display on startup
Alan Newberger [Fri, 1 Aug 2014 21:08:37 +0000 (14:08 -0700)]
Restore grid initialization logic to fix grid display on startup

The large settings refactor in ag/484817 not only changed settings
calls in ButtonManager.initializeGridLinesButton, it altered the
order of calls to create the button callback and to set the button
state. The prior implementation and this CL creates the callback,
and then sets state so that the callback, which controls display,
runs upon initial state setup of the button. Otherwise the grid
is not shown correctly on module startup.

Bug: 16687954
Change-Id: I482906d2d54a8545066dded3209b55ae4ad48bdb

9 years ago[OC] Refactoring the session API before intgrating GCam into OneCamera
Sascha Haeberling [Thu, 31 Jul 2014 23:05:57 +0000 (16:05 -0700)]
[OC] Refactoring the session API before intgrating GCam into OneCamera

  Bug: 16654225

Change-Id: I3fe6f46847ed6424310a81722c93c63be8b807a3

9 years agoMove display orientation calculations out of app code
Sol Boucher [Fri, 25 Jul 2014 06:59:21 +0000 (23:59 -0700)]
Move display orientation calculations out of app code

Because they're needed by every app, these are being relocated into the
portability layer. As such, the CameraUtil#getDisplayOrientation() and
CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic
CameraDeviceInfo.Characteristics#getPreviewOrientation() and
CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively.

Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0

9 years agoImproved logging of foreground source type.
Andy Huibers [Thu, 31 Jul 2014 18:10:24 +0000 (11:10 -0700)]
Improved logging of foreground source type.

Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af

9 years agoMerge "[OC] Hook new Capture module up, behind a system property." into ub-camera...
Sascha Haeberling [Thu, 31 Jul 2014 15:21:09 +0000 (15:21 +0000)]
Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier

9 years ago[OC] Adds the new CaptureModule and UI.
Sascha Haeberling [Thu, 31 Jul 2014 00:48:52 +0000 (17:48 -0700)]
[OC] Adds the new CaptureModule and UI.

  Bug: 16654225

This is essentially a version of the GCamModule without GCam, plus a few
things we need from PhotoModule.

Some code is commented out to be added back in later as a reminder.

CLs to hook the module up will be following up.

Change-Id: I70108529f81a8b0b744dc846287ea2ac121c85da

9 years ago[OC] Hook new Capture module up, behind a system property.
Sascha Haeberling [Thu, 31 Jul 2014 03:17:30 +0000 (20:17 -0700)]
[OC] Hook new Capture module up, behind a system property.

  Bug: 16654225

Change-Id: I6be44fefce66c09425a1bebc1942489f6af7636c

9 years agoPrevent monkey crash when deleting without data
Sascha Haeberling [Wed, 30 Jul 2014 17:31:29 +0000 (10:31 -0700)]
Prevent monkey crash when deleting without data

  Bug: 16536894

Change-Id: I960c0d8f61b2909c7020d3c259fbad8f8c33bc05

9 years agoCleaning up unused strings.
Sascha Haeberling [Wed, 30 Jul 2014 02:43:42 +0000 (19:43 -0700)]
Cleaning up unused strings.

'et' and 'ms' are deprecated and have already been removed from master:
http://ag/506364

Change-Id: I0acb1a5225f0b7c9c3dcf449b0a16bb7f77118ed

9 years ago[OC] Camera2-based OneCamera implementation.
Sascha Haeberling [Wed, 30 Jul 2014 00:28:46 +0000 (17:28 -0700)]
[OC] Camera2-based OneCamera implementation.

  Bug: 16654225

Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9

9 years agoMerge "Put conversion from string to size into SettingsManager." into ub-camera-glacier
Sascha Haeberling [Wed, 30 Jul 2014 01:12:51 +0000 (01:12 +0000)]
Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier

9 years agoAdd empty version of SystemProperties interface.
Sascha Haeberling [Wed, 30 Jul 2014 00:32:17 +0000 (17:32 -0700)]
Add empty version of SystemProperties interface.

This is so that we can use it in Camera2 code.

Change-Id: I764adb7377b91b5b54a33535188eb6d0d5159253

9 years agoPut conversion from string to size into SettingsManager.
Sascha Haeberling [Wed, 30 Jul 2014 00:08:18 +0000 (17:08 -0700)]
Put conversion from string to size into SettingsManager.

This way we don't have to spread this logic throughout the codebase.

Change-Id: I2d534d0756a9030e6d67b479a67c86c1cf596589

9 years agoMinor clean-up around the code base.
Sascha Haeberling [Wed, 30 Jul 2014 00:05:43 +0000 (17:05 -0700)]
Minor clean-up around the code base.

Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d

9 years ago[OC] Adding the OneCamera manager API.
Sascha Haeberling [Tue, 29 Jul 2014 23:29:02 +0000 (16:29 -0700)]
[OC] Adding the OneCamera manager API.

  Bug: 16654225

Change-Id: I070f36a6e6c1e756223ff69b74c3171547090f97

9 years ago[OC] Add common abstract OneCamera class.
Sascha Haeberling [Tue, 29 Jul 2014 23:02:52 +0000 (16:02 -0700)]
[OC] Add common abstract OneCamera class.

  Bug: 16654225

Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4

9 years ago[OC] Version 1 of the nterface for OneCamera.
Sascha Haeberling [Tue, 29 Jul 2014 22:46:39 +0000 (15:46 -0700)]
[OC] Version 1 of the nterface for OneCamera.

  Bug: 16654225

Change-Id: Id4a6755577e327849ce60db7c5f64d76fb0a55b2

9 years agoMerge "[OC] Adds a class with common utility functions for capture modules." into...
Sascha Haeberling [Tue, 29 Jul 2014 22:41:54 +0000 (22:41 +0000)]
Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier

9 years ago[OC] Adds a class with common utility functions for capture modules.
Sascha Haeberling [Tue, 29 Jul 2014 18:14:39 +0000 (11:14 -0700)]
[OC] Adds a class with common utility functions for capture modules.

  Bug: 16654225

Change-Id: I7bc2eaaa928fd152d20777086abef984421cc320

9 years agoAndroidManifest formatting cleanup
Spike Sprague [Mon, 28 Jul 2014 22:15:10 +0000 (15:15 -0700)]
AndroidManifest formatting cleanup

Change-Id: I279e764987fea743aa78575748a831e31ba28c0c

9 years agore-added color and background entries for gcam
Spike Sprague [Fri, 25 Jul 2014 21:11:42 +0000 (14:11 -0700)]
re-added color and background entries for gcam

bug: 16567671
Change-Id: Ifbe7bd68f0f6c47f645b420ef35d6eb6478c4a7e

9 years agoadded a mutate() call when loading LayerDrawables.
Spike Sprague [Fri, 25 Jul 2014 19:19:11 +0000 (12:19 -0700)]
added a mutate() call when loading LayerDrawables.

bug: 16566825
Change-Id: I71a3a9787b73957f9c34bf1ffa52df41c3a5f6e6

9 years agoMerge "Ensure default focus mode is continuous-picture" into ub-camera-glacier
Alan Newberger [Thu, 24 Jul 2014 23:15:18 +0000 (23:15 +0000)]
Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier

9 years agoEnsure default focus mode is continuous-picture
Alan Newberger [Thu, 24 Jul 2014 22:55:37 +0000 (15:55 -0700)]
Ensure default focus mode is continuous-picture

The new Settings infrastructure created a bug where the default
focus mode was 'auto', it needs to be continuous-picture. Fixing
here. Also adding verbose logging to the focus manager, could be
helpful in the future.

Bug: 16536583
Change-Id: I80b5905524f7fdaf69097ff8d2780da9f4ee2428

9 years agoMerge "ripple drawable on shutter button" into ub-camera-glacier
Spike Sprague [Thu, 24 Jul 2014 23:15:15 +0000 (23:15 +0000)]
Merge "ripple drawable on shutter button" into ub-camera-glacier

9 years agoripple drawable on shutter button
Spike Sprague [Sat, 19 Jul 2014 00:34:03 +0000 (17:34 -0700)]
ripple drawable on shutter button

bug: 16123188
Change-Id: I390279acb7a4599f1aeba71b415f1261b9a9b97b

9 years agoam 21b8cb69: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 21:48:33 +0000 (21:48 +0000)]
am 21b8cb69: (-s ours) Import translations. DO NOT MERGE

* commit '21b8cb696c05ef5207d290f3a1ed52453e58f525':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 10:36:34 +0000 (03:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6bef6048568c35ef35de13ca1cfb42e663622877
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 24 Jul 2014 10:34:53 +0000 (03:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: I991834972e54ce3ad2020dc2244a5c139aa66c32
Auto-generated-cl: translation import

9 years agoUpgrade mode index settings after mode indices were cleaned
Alan Newberger [Wed, 23 Jul 2014 18:25:07 +0000 (11:25 -0700)]
Upgrade mode index settings after mode indices were cleaned

Because we removed a mode index from the camera_mode_* sequence in res/values/arrays.xml,
upgrades were found to crash when settings referred to the old, now nonexistent mode value.
This CL preserves the arrays cleanup and adds a settings upgrade to convert modes to the
new value. Tested and works properly with mode preservation.

Bug: 16467318
Change-Id: I1352a940285687af38290250d7a06b5b7c421338

9 years agoModify Camera settings scope enforcement from crash to warning
Alan Newberger [Wed, 23 Jul 2014 01:46:41 +0000 (18:46 -0700)]
Modify Camera settings scope enforcement from crash to warning

Several bugs have appeared particularly for flash settings, where the app
is attempting to get a scope per the new SettingsManager, and the camera
is already closed meaning there is no valid scope. With this change, such
situations will be logged with call stack traces, so if we see deviant
user behavior we'll know the source. Monkeys should no longer trip settings
crashes with this change.

Bug: 16483952
Bug: 16491601
Change-Id: I26487bc58909a05183563f59ae3cfba571f2504e

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 03:45:09 +0000 (20:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: I90b31e5a34b7ae3463e8006f501b45b031c58025
Auto-generated-cl: translation import

9 years agoSpeed up lockscreen start-up time.
Sascha Haeberling [Thu, 17 Jul 2014 21:06:02 +0000 (14:06 -0700)]
Speed up lockscreen start-up time.

  Bug: 16375664

- Avoid unnecessary camera open/close loop (~350ms)
- Don't load sounds and do other init work when not needed.

Change-Id: I5d297913dcbd3100034c3915119cc3c818f330d3

9 years agoMerge "filmstip quantumification" into ub-camera-glacier
Spike Sprague [Tue, 22 Jul 2014 18:23:05 +0000 (18:23 +0000)]
Merge "filmstip quantumification" into ub-camera-glacier

9 years agofilmstip quantumification
Spike Sprague [Mon, 21 Jul 2014 20:19:10 +0000 (13:19 -0700)]
filmstip quantumification

bug: 16456504

Change-Id: I7c4c309671ae08179f22c35ffa7f3f9f5b4ee7ce

9 years agoam 373c970d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 17:18:30 +0000 (17:18 +0000)]
am 373c970d: (-s ours) Import translations. DO NOT MERGE

* commit '373c970d5d2c7877890f912e072f232438831b76':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jul 2014 03:46:21 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I27bcda4f98bb79dca1e4e06cd5b4abd036245357
Auto-generated-cl: translation import

9 years agoMerge "fixing mode -> color mapping" into ub-camera-glacier
Spike Sprague [Mon, 21 Jul 2014 18:57:21 +0000 (18:57 +0000)]
Merge "fixing mode -> color mapping" into ub-camera-glacier

9 years agofixing mode -> color mapping
Spike Sprague [Mon, 21 Jul 2014 18:55:36 +0000 (11:55 -0700)]
fixing mode -> color mapping

bug: 16123081
Change-Id: I3694e575e8461f4faf6dec076f5afe2a320eaecc

9 years agoMake sure to set an audio source using MediaRecorder.
Sascha Haeberling [Mon, 21 Jul 2014 18:31:13 +0000 (11:31 -0700)]
Make sure to set an audio source using MediaRecorder.

  Bug: 16454543

Change-Id: Ic3bfb14bd7d37e5feda43e50eafcf2e687dee0ce

9 years agoMerge "clean out timelapse stuff from codebase" into ub-camera-glacier
Spike Sprague [Fri, 18 Jul 2014 18:36:32 +0000 (18:36 +0000)]
Merge "clean out timelapse stuff from codebase" into ub-camera-glacier

9 years agoRoute switch preferences through SettingManager
Alan Newberger [Thu, 17 Jul 2014 16:55:34 +0000 (09:55 -0700)]
Route switch preferences through SettingManager

This CL adds a custom switch which uses SettingsManager to control
boolean settings. It relocates SettingsManager to the application
to allow access from multiple activities.

Bug: 16327665
Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38

9 years agoresolved conflicts for merge of dcea7639 to ub-camera-glacier
Sascha Haeberling [Thu, 17 Jul 2014 22:05:26 +0000 (15:05 -0700)]
resolved conflicts for merge of dcea7639 to ub-camera-glacier

Change-Id: I151b172d3e415a529375351ba8c038308e593cd5

9 years agoclean out timelapse stuff from codebase
Spike Sprague [Wed, 16 Jul 2014 22:47:32 +0000 (15:47 -0700)]
clean out timelapse stuff from codebase

Change-Id: Ibcf07302f3eea2800d1f36c918ffe1c3d93b8018

9 years agoupdating mode selector colors
Spike Sprague [Wed, 16 Jul 2014 21:33:59 +0000 (14:33 -0700)]
updating mode selector colors

bug: 16123081
Change-Id: Ibe0b886f73fa934a94e7a1b534a67b56fdeb60d7

9 years agoStore temp session data in 'cache' directory, not data.
Sascha Haeberling [Tue, 15 Jul 2014 23:48:20 +0000 (16:48 -0700)]
Store temp session data in 'cache' directory, not data.

  Bug: 16010129

Change-Id: I06ff67d2917580e1f44bdb6686a9371239bccfef

9 years agoDon't try to show storage hint if activity is no longer running.
Sascha Haeberling [Tue, 15 Jul 2014 15:54:40 +0000 (08:54 -0700)]
Don't try to show storage hint if activity is no longer running.

  Bug: 16198208

Change-Id: I6a6c92286c98cff8b55434a7a0d011bf5043d183

9 years agoam 3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the...
Sascha Haeberling [Tue, 15 Jul 2014 00:00:52 +0000 (00:00 +0000)]
am 3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.

* commit '3c6de14b6e771b6eab84428d53543b066324b8f0':
  Work in #onPictureTaken will be on a forked, so no need to fork the call.

9 years agoDon't crash if filename could not be found for ID.
Sascha Haeberling [Mon, 14 Jul 2014 23:18:38 +0000 (16:18 -0700)]
Don't crash if filename could not be found for ID.

  Bug: 15890671

This is only used for logging but Monkey's crash on master.

Change-Id: I0d08d0a82fd6a7073c7aa1924c21beeb66859577

9 years agoWork in #onPictureTaken will be on a forked, so no need to fork the call.
Sascha Haeberling [Mon, 14 Jul 2014 19:23:36 +0000 (12:23 -0700)]
Work in #onPictureTaken will be on a forked, so no need to fork the call.

  Bug: 16217551

Change-Id: Id9f6e129d402d5e58cf5f63380c5bf13ab996431

9 years agoam c17a5664: Prevent a monkey-generated crash.
Sascha Haeberling [Fri, 11 Jul 2014 17:26:29 +0000 (17:26 +0000)]
am c17a5664: Prevent a monkey-generated crash.

* commit 'c17a56643186dee671bf6e7dec54cd558a7ecb2f':
  Prevent a monkey-generated crash.

9 years agoPrevent a monkey-generated crash.
Sascha Haeberling [Thu, 10 Jul 2014 21:43:13 +0000 (14:43 -0700)]
Prevent a monkey-generated crash.

  Bug: 16191092

Change-Id: Ic6488381ed6f80184401c925dd6891126736019f

9 years agoMerge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera...
Sol Boucher [Wed, 9 Jul 2014 22:58:52 +0000 (22:58 +0000)]
Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier

9 years agoEliminate unnecessary context in FragmentActivity constructor
Sol Boucher [Wed, 9 Jul 2014 22:44:00 +0000 (15:44 -0700)]
Eliminate unnecessary context in FragmentActivity constructor

Use the one that was already being obtained from getApplicationContext() instead

Change-Id: I1e0a62449b3ac9d02404fa623c0c62063069aae2

9 years agoFix crash when dimensions are <= 0.
Sam Judd [Wed, 9 Jul 2014 18:17:26 +0000 (11:17 -0700)]
Fix crash when dimensions are <= 0.

Change-Id: I78531a025cf209b59f768ab38ea96ce0fe44c401

9 years agoMerge "Make app build against updated frameworks/ex portability library" into ub...
Sol Boucher [Wed, 9 Jul 2014 21:35:09 +0000 (21:35 +0000)]
Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier

9 years agoMerge commit 'acfad92c' into merge_crash_fix
Sam Judd [Wed, 9 Jul 2014 20:00:59 +0000 (13:00 -0700)]
Merge commit 'acfad92c' into merge_crash_fix

Conflicts:
src/com/android/camera/data/LocalMediaData.java

Change-Id: I7000054e53f1258a3de2253a816b091689d62da5

9 years agoMake app build against updated frameworks/ex portability library
Sol Boucher [Wed, 2 Jul 2014 17:37:18 +0000 (10:37 -0700)]
Make app build against updated frameworks/ex portability library

This is necessary to make the app build and run against the updated library, and
specifically the CameraAgentFactory, CameraAgent, and CameraAgent.CameraProxy
contracts.

Change-Id: I2dde04df7ae552eec022d31f78b0ce05525282cd

9 years agoam 1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimm...
Spike Sprague [Mon, 7 Jul 2014 22:28:31 +0000 (22:28 +0000)]
am 1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake

* commit '1d1af90609b7a896f74dda83b7f22f91b50e70cf':
  previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button

9 years agoam 04ebcbba: make ProgressOverlay obey left and top of its bounding Rect
Spike Sprague [Mon, 7 Jul 2014 21:41:12 +0000 (21:41 +0000)]
am 04ebcbba: make ProgressOverlay obey left and top of its bounding Rect

* commit '04ebcbbab90b1ccb263247c39b45ade232de7b0a':
  make ProgressOverlay obey left and top of its bounding Rect

9 years agomake ProgressOverlay obey left and top of its bounding Rect
Spike Sprague [Mon, 7 Jul 2014 21:34:09 +0000 (14:34 -0700)]
make ProgressOverlay obey left and top of its bounding Rect

bug: 16061226
Change-Id: If2e3748963191963f6e9223699cb0144a9710d5d

9 years agoam 90defd62: Merge "disable shutter button when mode list is open" into ub-camera...
Spike Sprague [Mon, 7 Jul 2014 19:42:11 +0000 (19:42 +0000)]
am 90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake

* commit '90defd62b3d0eed8cf3906c7f8394fc9ad401759':
  disable shutter button when mode list is open

9 years agoresolved conflicts for merge of ff899495 to ub-camera-glacier
Sascha Haeberling [Mon, 7 Jul 2014 18:34:19 +0000 (11:34 -0700)]
resolved conflicts for merge of ff899495 to ub-camera-glacier

Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60

9 years agoam 950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera...
Sam Judd [Mon, 7 Jul 2014 18:07:19 +0000 (18:07 +0000)]
am 950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake

* commit '950fb6b8e8e7663f09428f25f2f788a3a191baef':
  Ensure photosphere/pano thumbs are always shown.

9 years agoMerge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling...
Spike Sprague [Mon, 7 Jul 2014 22:24:56 +0000 (22:24 +0000)]
Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake

9 years agoprevious CL ag/496035 disabled shutter button clicks during shimmy,
Spike Sprague [Mon, 7 Jul 2014 22:13:27 +0000 (15:13 -0700)]
previous CL ag/496035 disabled shutter button clicks during shimmy,
scaling back a11y disabling on shutter button

Change-Id: I1c788ccbd946b43774f9f4a7bf629c4e019f20f9

9 years agoMerge "Fix regression: Update summary when quality settings change." into ub-camera...
Sascha Haeberling [Mon, 7 Jul 2014 18:07:59 +0000 (18:07 +0000)]
Merge "Fix regression: Update summary when quality settings change." into ub-camera-fishlake

9 years agoFix regression: Update summary when quality settings change.
Sascha Haeberling [Mon, 7 Jul 2014 17:59:19 +0000 (10:59 -0700)]
Fix regression: Update summary when quality settings change.

  Bug: 16062378

Change-Id: I8532ac5bcc73a36b9666903d985bf13424819a0f

9 years agoMerge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
Sam Judd [Mon, 7 Jul 2014 18:03:06 +0000 (18:03 +0000)]
Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake

9 years agoEnsure photosphere/pano thumbs are always shown.
Sam Judd [Mon, 7 Jul 2014 17:40:12 +0000 (10:40 -0700)]
Ensure photosphere/pano thumbs are always shown.

Bug: 16061224
Change-Id: I93f1dd8a094cd4f00d06c02c13f51ef8545aa26c

9 years agoam 1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy"...
Spike Sprague [Mon, 7 Jul 2014 17:31:52 +0000 (17:31 +0000)]
am 1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake

* commit '1e89c9196d91175bcc3d878c95b230d93cd5280c':
  disable talkback a11y navigation on mode list during shimmy

9 years agoam 3c866166: (-s ours) am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translati...
Baligh Uddin [Sun, 6 Jul 2014 21:27:26 +0000 (21:27 +0000)]
am 3c866166: (-s ours) am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE

* commit '3c8661666ceb9049061ebf2b120cb51276c1cece':
  Import translations. DO NOT MERGE

9 years agoam c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:28 +0000 (21:24 +0000)]
am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE

* commit 'c0f064313c2fa318a4c21947ab57e7c1e3c67fc9':
  Import translations. DO NOT MERGE

9 years agoam aca13396: (-s ours) am 2ee019be: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:24:15 +0000 (21:24 +0000)]
am aca13396: (-s ours) am 2ee019be: (-s ours) Import translations. DO NOT MERGE

* commit 'aca13396a6d18542c9550f7ff5b6a262c4e1937d':
  Import translations. DO NOT MERGE

9 years agoam 2ee019be: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:21 +0000 (21:21 +0000)]
am 2ee019be: (-s ours) Import translations. DO NOT MERGE

* commit '2ee019bee75241d3e1f338d04491900a65c1c79f':
  Import translations. DO NOT MERGE

9 years agoam cb0f330b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:08 +0000 (21:21 +0000)]
am cb0f330b: (-s ours) Import translations. DO NOT MERGE

* commit 'cb0f330b34124e72504e58e9a15de5cd2e08a2dd':
  Import translations. DO NOT MERGE

9 years agoam e6828fb6: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:07 +0000 (21:21 +0000)]
am e6828fb6: (-s ours) Import translations. DO NOT MERGE

* commit 'e6828fb681ad7e70afaaf9cee54300f870b51cff':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:08:18 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1c7a134d69f9dfe74dd2fa8dfbf4b807d455d211
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:06:58 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia3403c2c617c86e31b946c9343176c600da4349d
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:06:20 +0000 (07:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: If1c48d20759de0043d1a2252af132382c02f1b5a
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 14:00:18 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I90257ae7d06ce7585fa4293cbe18703d2e9c1e6c
Auto-generated-cl: translation import

9 years agoMerge "disable shutter button when mode list is open" into ub-camera-fishlake
Spike Sprague [Mon, 7 Jul 2014 19:14:17 +0000 (19:14 +0000)]
Merge "disable shutter button when mode list is open" into ub-camera-fishlake

9 years agodisable shutter button when mode list is open
Spike Sprague [Thu, 3 Jul 2014 00:08:43 +0000 (17:08 -0700)]
disable shutter button when mode list is open

bug: 16042076
Change-Id: I0b8fad7b40bb348a3be0fa3c9457a1ceb6a49b05

9 years agoChange HDR plus flash default to off.
Erin Dahlgren [Wed, 2 Jul 2014 17:39:17 +0000 (10:39 -0700)]
Change HDR plus flash default to off.

As Gcam is still experimenting with their flash setting,
turn it off so there is no accidental auto flash.

Change-Id: Id7a372a0b0123a43ff11d9a0ec8267e30d15a2b4

9 years agoMerge "disable talkback a11y navigation on mode list during shimmy" into ub-camera...
Spike Sprague [Mon, 7 Jul 2014 17:27:05 +0000 (17:27 +0000)]
Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake

9 years agodisable talkback a11y navigation on mode list during shimmy
Spike Sprague [Wed, 2 Jul 2014 22:58:32 +0000 (15:58 -0700)]
disable talkback a11y navigation on mode list during shimmy

bug: 16042079
Change-Id: Ied2c91326d924bbd032853c84bba19a6dc75c992

9 years agoam 02b9b9af: move intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:40:49 +0000 (18:40 +0000)]
am 02b9b9af: move intent review image view to proper spot in view hierachy

* commit '02b9b9af097ac7886ec1d23392cd87c9fbcb186f':
  move intent review image view to proper spot in view hierachy

9 years agomove intent review image view to proper spot in view hierachy
Spike Sprague [Wed, 2 Jul 2014 18:26:28 +0000 (11:26 -0700)]
move intent review image view to proper spot in view hierachy

bug: 15729563
Change-Id: Id0952399cc0577f728665843826dcc6f12c4429a