OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoam 47edeec6: am 2f92712c: re-added color and background entries for gcam
Spike Sprague [Fri, 25 Jul 2014 21:27:16 +0000 (21:27 +0000)]
am 47edeec6: am 2f92712c: re-added color and background entries for gcam

* commit '47edeec6fc05942676e9eae5861ca177237b8392':
  re-added color and background entries for gcam

9 years agoam 2f92712c: re-added color and background entries for gcam
Spike Sprague [Fri, 25 Jul 2014 21:21:10 +0000 (21:21 +0000)]
am 2f92712c: re-added color and background entries for gcam

* commit '2f92712cdb0598eead6631a0b8366a592c8c19c2':
  re-added color and background entries for gcam

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 agoam e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables.
Spike Sprague [Fri, 25 Jul 2014 21:07:32 +0000 (21:07 +0000)]
am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables.

* commit 'e70248ff6ad4ae0cb23ecd4b681a8d3b32198644':
  added a mutate() call when loading LayerDrawables.

9 years agoam ffa2ff02: added a mutate() call when loading LayerDrawables.
Spike Sprague [Fri, 25 Jul 2014 21:03:39 +0000 (21:03 +0000)]
am ffa2ff02: added a mutate() call when loading LayerDrawables.

* commit 'ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7':
  added a mutate() call when loading LayerDrawables.

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 agoreset to df5989b with history
Qiwen Zhao [Fri, 25 Jul 2014 18:32:52 +0000 (11:32 -0700)]
reset to df5989b with history

9 years agoReset to ub-camera-glacier at sha1 df5989b with history.
Qiwen Zhao [Fri, 25 Jul 2014 17:29:31 +0000 (10:29 -0700)]
Reset to ub-camera-glacier at sha1 df5989b with history.

9 years agoam 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session stora...
Sascha Haeberling [Fri, 25 Jul 2014 17:03:54 +0000 (17:03 +0000)]
am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali

* commit '67e71a3dd8c6b1e974e3235080fb99784d7e7ce3':

9 years agoam ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background...
Erin Dahlgren [Fri, 25 Jul 2014 17:03:54 +0000 (17:03 +0000)]
am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali

* commit 'ee806b647f5a2c7b363245063ea22253aa06680c':

9 years agoam 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translati...
Baligh Uddin [Fri, 25 Jul 2014 17:03:53 +0000 (17:03 +0000)]
am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE

* commit '5993205fe867e2a48bf19fc066b9a5d6231c9ec6':

9 years agoam 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into...
Sascha Haeberling [Fri, 25 Jul 2014 16:58:28 +0000 (16:58 +0000)]
am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali

* commit '7266b9c7fefe80ece12b44b129b49759c8d1ad90':

9 years agoam 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb...
Erin Dahlgren [Fri, 25 Jul 2014 16:58:16 +0000 (16:58 +0000)]
am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali

* commit '82387f3da8eadb15d32e79f40e8ef917efebe9c3':

9 years agoam ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Jul 2014 16:58:08 +0000 (16:58 +0000)]
am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE

* commit 'ba0bccbf9124f5d6662c1421ceb965800309ffb8':

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

10 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

10 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

10 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

10 years agoam cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 20 Jul 2014 02:27:33 +0000 (02:27 +0000)]
am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit 'cec3a4bacb58ac44d8bc0baa5c3a1a6d1a48b0f4':
  Remove deprecated locales - DO NOT MERGE

10 years agoam 16788cc3: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Jul 2014 21:51:02 +0000 (21:51 +0000)]
am 16788cc3: (-s ours) Import translations. DO NOT MERGE

* commit '16788cc303637128cf37eaa2abea353239935908':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Jul 2014 02:00:49 +0000 (19:00 -0700)]
Import translations. DO NOT MERGE

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

10 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

10 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

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

bug: 16456504

Change-Id: I7c4c309671ae08179f22c35ffa7f3f9f5b4ee7ce

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 years agoMerge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 20 Jul 2014 02:24:56 +0000 (02:24 +0000)]
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

10 years agoRemove deprecated locales - DO NOT MERGE
Baligh Uddin [Sat, 19 Jul 2014 20:05:21 +0000 (13:05 -0700)]
Remove deprecated locales - DO NOT MERGE

Change-Id: I10b8ab1136680b93ac3184df47f8d6c4f663e9d1

10 years agoam f0010a8d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 14:18:21 +0000 (14:18 +0000)]
am f0010a8d: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 01:49:03 +0000 (18:49 -0700)]
Import translations. DO NOT MERGE

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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 years agoam 7947c9d8: (-s ours) am a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa...
Baligh Uddin [Sun, 6 Jul 2014 21:37:28 +0000 (21:37 +0000)]
am 7947c9d8: (-s ours) am a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE

* commit '7947c9d85c830c8b8a5c577097f6564967beeff6':
  Import translations. DO NOT MERGE

10 years agoam a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translati...
Baligh Uddin [Sun, 6 Jul 2014 21:30:21 +0000 (21:30 +0000)]
am a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE

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

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

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

10 years agoam 86018cbd: (-s ours) am 23d07fed: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:23 +0000 (21:28 +0000)]
am 86018cbd: (-s ours) am 23d07fed: (-s ours) Import translations. DO NOT MERGE

* commit '86018cbd26dbc6ab34f0de9fd95a88c71462e6bc':
  Import translations. DO NOT MERGE

10 years agoam 3be1f8f8: (-s ours) am e8fa640f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:28:22 +0000 (21:28 +0000)]
am 3be1f8f8: (-s ours) am e8fa640f: (-s ours) Import translations. DO NOT MERGE

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

10 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

10 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

10 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

10 years agoam 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:23:55 +0000 (21:23 +0000)]
am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE

* commit '8b602ee06eb668246fb43be849e6e4b047707253':
  Import translations. DO NOT MERGE

10 years agoam cd89e549: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:22:52 +0000 (21:22 +0000)]
am cd89e549: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 23d07fed: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:22:52 +0000 (21:22 +0000)]
am 23d07fed: (-s ours) Import translations. DO NOT MERGE

* commit '23d07fedc57934972132598b1c84a8668256d1b9':
  Import translations. DO NOT MERGE

10 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

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

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

10 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

10 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

10 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

10 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

10 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

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

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

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

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

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 years agoam d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
Sascha Häberling [Wed, 2 Jul 2014 18:16:27 +0000 (18:16 +0000)]
am d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake

* commit 'd2922674e622c924b288c42d8e468812ad548de2':
  Pass the real file length to MediaStore.