OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 20703f72: Merge "Flinging back should stop at the first photo first." into gb...
Angus Kong [Tue, 10 Sep 2013 23:56:38 +0000 (16:56 -0700)]
am 20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad

* commit '20703f72e087a01e6a589c2875819cf817581a51':
  Flinging back should stop at the first photo first.

10 years agoMerge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
Angus Kong [Tue, 10 Sep 2013 23:53:24 +0000 (23:53 +0000)]
Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad

10 years agoam e1d5ba4f: Hide zoom view when going to full screen
Doris Liu [Tue, 10 Sep 2013 23:48:32 +0000 (16:48 -0700)]
am e1d5ba4f: Hide zoom view when going to full screen

* commit 'e1d5ba4fc5470043e8645984e3018b712f5dfcff':
  Hide zoom view when going to full screen

10 years agoFlinging back should stop at the first photo first.
Angus Kong [Tue, 10 Sep 2013 22:42:46 +0000 (15:42 -0700)]
Flinging back should stop at the first photo first.

  bug:10634016

Change-Id: I44e715268b913902a444c977c136d1e0381b3833

10 years agoHide zoom view when going to full screen
Doris Liu [Tue, 10 Sep 2013 19:44:20 +0000 (12:44 -0700)]
Hide zoom view when going to full screen

Bug: 10654903

Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 10 Sep 2013 15:06:44 +0000 (15:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Tue, 10 Sep 2013 14:51:04 +0000 (07:51 -0700)]
am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '44c028746ab84c9f12e4f4db14aeda87c51d9835':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Tue, 10 Sep 2013 14:49:26 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoam 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos...
Angus Kong [Tue, 10 Sep 2013 05:15:57 +0000 (22:15 -0700)]
am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad

* commit '6aae9177ac432df82971facab214b365e92b4a04':
  Fix images being off-center in filmstrip.

10 years agoMerge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
Angus Kong [Tue, 10 Sep 2013 05:14:02 +0000 (05:14 +0000)]
Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad

10 years agoFix images being off-center in filmstrip.
Angus Kong [Tue, 10 Sep 2013 00:15:01 +0000 (17:15 -0700)]
Fix images being off-center in filmstrip.

  bug:10609827
  bug:10650966

Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c

10 years agoam e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
Doris Liu [Tue, 10 Sep 2013 01:25:18 +0000 (18:25 -0700)]
am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad

* commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9':
  Hide zoom view when back is pressed

10 years agoMerge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
Doris Liu [Tue, 10 Sep 2013 01:24:25 +0000 (01:24 +0000)]
Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad

10 years agoam f8b877c2: Update indicators at the right time to show the correct state.
Sascha Haeberling [Tue, 10 Sep 2013 01:10:11 +0000 (18:10 -0700)]
am f8b877c2: Update indicators at the right time to show the correct state.

* commit 'f8b877c2dd4fed2c962c51d619e2548923888525':
  Update indicators at the right time to show the correct state.

10 years agoHide zoom view when back is pressed
Doris Liu [Tue, 10 Sep 2013 00:26:14 +0000 (17:26 -0700)]
Hide zoom view when back is pressed

Bug: 10677244
Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7

10 years agoUpdate indicators at the right time to show the correct state.
Sascha Haeberling [Tue, 10 Sep 2013 00:32:48 +0000 (17:32 -0700)]
Update indicators at the right time to show the correct state.

  Bug: 10620907

Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5

10 years agoam b7639c64: Make sure we switch to preview view when resuming.
Sascha Haeberling [Mon, 9 Sep 2013 23:01:29 +0000 (16:01 -0700)]
am b7639c64: Make sure we switch to preview view when resuming.

* commit 'b7639c641f2ed5d0c60546349c3aa9e90c026878':
  Make sure we switch to preview view when resuming.

10 years agoMake sure we switch to preview view when resuming.
Sascha Haeberling [Mon, 9 Sep 2013 21:42:43 +0000 (14:42 -0700)]
Make sure we switch to preview view when resuming.

  Bug: 10640328

But we need to make sure to not always switch in onResume, as
some activities stared from us (like playing a video or editing)
require the UI flow to stay in filmstrip.

Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf

10 years agoam 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad
ztenghui [Mon, 9 Sep 2013 21:10:37 +0000 (14:10 -0700)]
am 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad

* commit '08d82bae967db1cc090ab763f072e0410eb4b05e':
  Update the data after edit.

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Sep 2013 21:07:19 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Sep 2013 21:05:59 +0000 (14:05 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Update the data after edit." into gb-ub-photos-carlsbad
ztenghui [Mon, 9 Sep 2013 20:53:24 +0000 (20:53 +0000)]
Merge "Update the data after edit." into gb-ub-photos-carlsbad

10 years agoUpdate the data after edit.
ztenghui [Fri, 6 Sep 2013 21:57:15 +0000 (14:57 -0700)]
Update the data after edit.

bug:10411943

Change-Id: I94804d581470a87f7449a2a249b0b2a27ab640a2

10 years agoam a7194601: Disable swipe in capture intent mode.
Angus Kong [Sat, 7 Sep 2013 00:39:28 +0000 (17:39 -0700)]
am a7194601: Disable swipe in capture intent mode.

* commit 'a71946012df0eee8fe4859a22da3c56feba0344e':
  Disable swipe in capture intent mode.

10 years agoDisable swipe in capture intent mode.
Angus Kong [Sat, 7 Sep 2013 00:20:15 +0000 (17:20 -0700)]
Disable swipe in capture intent mode.

  bug:10606988

Change-Id: Iaf80cdef5b463795b9847f2ab9ab5c70f3f0083c

10 years agoam 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
Angus Kong [Fri, 6 Sep 2013 21:48:28 +0000 (14:48 -0700)]
am 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad

* commit '56ad83f797ab09af240d1f67d63e55dd602160c1':
  Respect system auto-rotate setting.

10 years agoMerge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
Angus Kong [Fri, 6 Sep 2013 21:46:25 +0000 (21:46 +0000)]
Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad

10 years agoam 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad
Angus Kong [Fri, 6 Sep 2013 20:33:52 +0000 (13:33 -0700)]
am 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad

* commit '080f868350a0f8c7666f5f5935db1e2b0a75f7f1':
  Improve swipe gesture in filmstrip.

10 years agoMerge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad
Angus Kong [Fri, 6 Sep 2013 20:32:06 +0000 (20:32 +0000)]
Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad

10 years agoImprove swipe gesture in filmstrip.
Angus Kong [Thu, 5 Sep 2013 23:12:22 +0000 (16:12 -0700)]
Improve swipe gesture in filmstrip.

  bug:10552605
  bug:10645736

Change-Id: I7f524c191b0d8bd051ce9e1399a1265d0cac2f25

10 years agoam 5199c207: Set the system UI to low profile when we hide the action bar.
Sascha Haeberling [Fri, 6 Sep 2013 18:55:35 +0000 (11:55 -0700)]
am 5199c207: Set the system UI to low profile when we hide the action bar.

* commit '5199c2078f3aea06732015ce8ad354c066a2f4ec':
  Set the system UI to low profile when we hide the action bar.

10 years agoSet the system UI to low profile when we hide the action bar.
Sascha Haeberling [Fri, 6 Sep 2013 00:10:19 +0000 (17:10 -0700)]
Set the system UI to low profile when we hide the action bar.

  Bug: 10633686

Change-Id: I3fca7b608807fd0a510641c7b32724173587c458

10 years agoam cd7b8c13: Re-add a strings that should not have cleaned up.
Sascha Haeberling [Fri, 6 Sep 2013 17:43:12 +0000 (10:43 -0700)]
am cd7b8c13: Re-add a strings that should not have cleaned up.

* commit 'cd7b8c13c3372f6124d284d45a5082dc7135ce7a':
  Re-add a strings that should not have cleaned up.

10 years agoRe-add a strings that should not have cleaned up.
Sascha Haeberling [Fri, 6 Sep 2013 17:11:42 +0000 (10:11 -0700)]
Re-add a strings that should not have cleaned up.

  Bug: 10647548

Change-Id: I7b99a82a0748ed8ec8d5b288e8f1ed62d77d10ac

10 years agoam 46c09ba0: Remove unused strings.
Sascha Haeberling [Fri, 6 Sep 2013 06:48:30 +0000 (23:48 -0700)]
am 46c09ba0: Remove unused strings.

* commit '46c09ba0ef7fac45ab7109d8608290c50cf40bce':
  Remove unused strings.

10 years agoRemove unused strings.
Sascha Haeberling [Thu, 5 Sep 2013 05:02:57 +0000 (22:02 -0700)]
Remove unused strings.

  Bug: 10627919

Change-Id: I5434baf8785912a577fec9f363598e4d927fddc3

10 years agoRespect system auto-rotate setting.
Angus Kong [Fri, 6 Sep 2013 00:49:06 +0000 (17:49 -0700)]
Respect system auto-rotate setting.

  bug:10623244

Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff

10 years agoam 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Fri, 6 Sep 2013 04:39:59 +0000 (21:39 -0700)]
am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '01f12724c0a0950e3d1d1c64cc7f1fb59ec3e316':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 6 Sep 2013 04:38:03 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 6 Sep 2013 04:37:51 +0000 (04:37 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoam fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
Doris Liu [Thu, 5 Sep 2013 21:47:55 +0000 (14:47 -0700)]
am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad

* commit 'fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc':
  Fix black screen in mode switching

10 years agoMerge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
Doris Liu [Thu, 5 Sep 2013 21:44:50 +0000 (21:44 +0000)]
Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad

10 years agoFix black screen in mode switching
Doris Liu [Thu, 5 Sep 2013 21:15:09 +0000 (14:15 -0700)]
Fix black screen in mode switching

Bug: 10632592
Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Sep 2013 20:23:43 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Sep 2013 20:21:55 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
Angus Kong [Thu, 5 Sep 2013 04:49:40 +0000 (21:49 -0700)]
am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad

* commit '33bb2d47fa5850c14f7fe42e07ab6f21585efade':
  Bring back wide angle panorama.

10 years agoMerge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
Angus Kong [Thu, 5 Sep 2013 04:47:51 +0000 (04:47 +0000)]
Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad

10 years agoam 1ef76d4c: reintroduce action bar hiding for onDataChanged
Alan Newberger [Thu, 5 Sep 2013 04:26:32 +0000 (21:26 -0700)]
am 1ef76d4c: reintroduce action bar hiding for onDataChanged

* commit '1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6':
  reintroduce action bar hiding for onDataChanged

10 years agoreintroduce action bar hiding for onDataChanged
Alan Newberger [Thu, 5 Sep 2013 02:01:59 +0000 (19:01 -0700)]
reintroduce action bar hiding for onDataChanged

this code was present but got inadvertently removed by a subsequent
change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8.

Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f

10 years agoam 5633994e: Increase char limit.
Sascha Haeberling [Thu, 5 Sep 2013 00:02:55 +0000 (17:02 -0700)]
am 5633994e: Increase char limit.

* commit '5633994ecddb26bdd7a577a5b015b95bcb33e309':
  Increase char limit.

10 years agoIncrease char limit.
Sascha Haeberling [Wed, 4 Sep 2013 23:59:43 +0000 (16:59 -0700)]
Increase char limit.

  Bug: 10590844

Change-Id: Ib30d348c1806e5c1b174bdd5198b880a2dca14e5

10 years agoam 33035c19: Bring back \'share 360 photosphere\' to filmstrip
Mangesh Ghiware [Wed, 4 Sep 2013 23:36:48 +0000 (16:36 -0700)]
am 33035c19: Bring back \'share 360 photosphere\' to filmstrip

* commit '33035c19cc47adfb738c20cef66652ae451c8e10':
  Bring back 'share 360 photosphere' to filmstrip

10 years agoBring back 'share 360 photosphere' to filmstrip
Mangesh Ghiware [Fri, 23 Aug 2013 20:28:21 +0000 (13:28 -0700)]
Bring back 'share 360 photosphere' to filmstrip

Bug: 10367406
Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8

10 years agoam 121022cb: Double tap to zoom all the way in and out
Doris Liu [Wed, 4 Sep 2013 23:27:41 +0000 (16:27 -0700)]
am 121022cb: Double tap to zoom all the way in and out

* commit '121022cb590955e37f1264f77190ce4711159976':
  Double tap to zoom all the way in and out

10 years agoDouble tap to zoom all the way in and out
Doris Liu [Tue, 3 Sep 2013 23:03:16 +0000 (16:03 -0700)]
Double tap to zoom all the way in and out

Bug: 10308195
Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55

10 years agoBring back wide angle panorama.
Angus Kong [Mon, 19 Aug 2013 22:06:12 +0000 (15:06 -0700)]
Bring back wide angle panorama.

  bug:10293937

Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 4 Sep 2013 05:07:35 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 4 Sep 2013 05:05:44 +0000 (22:05 -0700)]
am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '7ff7b04dd187b2662c9faeb58f660a248b3764a7':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Wed, 4 Sep 2013 05:03:40 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoam 26145e56: Use app_name label now that we have the correct translations.
Sascha Haeberling [Wed, 4 Sep 2013 00:14:01 +0000 (17:14 -0700)]
am 26145e56: Use app_name label now that we have the correct translations.

* commit '26145e56f6e98733569b7093573fc26f44d3cfa5':
  Use app_name label now that we have the correct translations.

10 years agoUse app_name label now that we have the correct translations.
Sascha Haeberling [Wed, 4 Sep 2013 00:02:11 +0000 (17:02 -0700)]
Use app_name label now that we have the correct translations.

  Bug: 10509882

Change-Id: I58e7d26afb5636fa156ec22b7c1cfa21262dd9f7

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 3 Sep 2013 21:41:09 +0000 (14:41 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 3 Sep 2013 21:39:33 +0000 (14:39 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub...
ztenghui [Tue, 3 Sep 2013 21:34:25 +0000 (14:34 -0700)]
am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad

* commit '269c824d720b2e902c4ad6c3bb23422644da1f41':
  Don't show the action bar in the capture intent.

10 years agoMerge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad
ztenghui [Tue, 3 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad

10 years agoam 2c3d9a58: Don\'t show action bar when in camera preview.
ztenghui [Tue, 3 Sep 2013 21:27:17 +0000 (14:27 -0700)]
am 2c3d9a58: Don\'t show action bar when in camera preview.

* commit '2c3d9a58d8942f73bc16c71e57584e4d89410185':
  Don't show action bar when in camera preview.

10 years agoDon't show action bar when in camera preview.
ztenghui [Tue, 3 Sep 2013 18:27:21 +0000 (11:27 -0700)]
Don't show action bar when in camera preview.

There are 3 cases we need to toggle the action bar.
1. Touch in full screen mode. onToggleActionBarVisibility()
2. Swipe back and forth to film stripe from preview. onSwitchMode()
3. In full screen mode, current data becomes the preview.
onCurrentDataChanged()

bug:10563392
Change-Id: I576c49b767cd863da725cf991238c27440d85b9b

10 years agoDon't show the action bar in the capture intent.
ztenghui [Tue, 3 Sep 2013 18:30:11 +0000 (11:30 -0700)]
Don't show the action bar in the capture intent.

bug:10571262

Change-Id: I85ed9c632f76084db95ce24277fb303c67c3949f

10 years agoam 5457782d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 31 Aug 2013 01:53:38 +0000 (18:53 -0700)]
am 5457782d: (-s ours) Import translations. DO NOT MERGE

* commit '5457782daf2d03bdc1ac8f6b7143c92c62c3cfd0':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 31 Aug 2013 01:48:09 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 1d9a8d7a: Rename renering message from panorama to photo sphere.
Sascha Haeberling [Sat, 31 Aug 2013 01:33:31 +0000 (18:33 -0700)]
am 1d9a8d7a: Rename renering message from panorama to photo sphere.

* commit '1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a':
  Rename renering message from panorama to photo sphere.

10 years agoRename renering message from panorama to photo sphere.
Sascha Haeberling [Sat, 31 Aug 2013 01:11:20 +0000 (18:11 -0700)]
Rename renering message from panorama to photo sphere.

  Bug: 7695145

Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315

10 years agoam 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb...
Doris Liu [Sat, 31 Aug 2013 00:37:10 +0000 (17:37 -0700)]
am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad

* commit '0dff7ce1f701816b4a634b612bcaaaae6de0da34':
  Reset zoom view when user exits app or rotate device

10 years agoam b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub...
Angus Kong [Sat, 31 Aug 2013 00:37:09 +0000 (17:37 -0700)]
am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad

* commit 'b2f0968c90a352cca43f508d216c3f28c3d2cc16':
  Make the preview thumbnail clicable after scaling.

10 years agoMerge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
Doris Liu [Sat, 31 Aug 2013 00:34:33 +0000 (00:34 +0000)]
Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad

10 years agoMerge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
Angus Kong [Sat, 31 Aug 2013 00:34:22 +0000 (00:34 +0000)]
Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad

10 years agoMake the preview thumbnail clicable after scaling.
Angus Kong [Sat, 31 Aug 2013 00:09:46 +0000 (17:09 -0700)]
Make the preview thumbnail clicable after scaling.

  bug:10552110

Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa

10 years agoReset zoom view when user exits app or rotate device
Doris Liu [Fri, 30 Aug 2013 23:20:58 +0000 (16:20 -0700)]
Reset zoom view when user exits app or rotate device

Bug:10308195
Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f

10 years agoam 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 30 Aug 2013 23:37:58 +0000 (16:37 -0700)]
am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad

* commit '72a57ddf178b410ffb3c4532fc4e56b8b1d99706':
  Automatic versioning for Camera.

10 years agoMerge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 30 Aug 2013 23:35:52 +0000 (23:35 +0000)]
Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad

10 years agoam 750e73c4: Merge "Measure all children to ensure correct layout position" into...
Doris Liu [Fri, 30 Aug 2013 23:32:53 +0000 (16:32 -0700)]
am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad

* commit '750e73c4a4b04a5695540d3c982774662307b58e':
  Measure all children to ensure correct layout position

10 years agoMerge "Measure all children to ensure correct layout position" into gb-ub-photos...
Doris Liu [Fri, 30 Aug 2013 23:30:18 +0000 (23:30 +0000)]
Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad

10 years agoam 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
Angus Kong [Fri, 30 Aug 2013 23:27:48 +0000 (16:27 -0700)]
am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad

* commit '8d2c6b830131a3d2e6ec7f2f8158b37506403dbd':
  Skip bitmaps with 0 dimension.

10 years agoMerge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
Angus Kong [Fri, 30 Aug 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad

10 years agoMeasure all children to ensure correct layout position
Doris Liu [Fri, 30 Aug 2013 23:25:00 +0000 (16:25 -0700)]
Measure all children to ensure correct layout position

Bug: 10412775
Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb

10 years agoam 5f6b50de: Add back button handlng to CameraActivity.
Alan Newberger [Fri, 30 Aug 2013 23:17:43 +0000 (16:17 -0700)]
am 5f6b50de: Add back button handlng to CameraActivity.

* commit '5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca':
  Add back button handlng to CameraActivity.

10 years agoSkip bitmaps with 0 dimension.
Angus Kong [Fri, 30 Aug 2013 22:10:38 +0000 (15:10 -0700)]
Skip bitmaps with 0 dimension.

  bug:10514553

Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31

10 years agoam 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 30 Aug 2013 22:56:30 +0000 (15:56 -0700)]
am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad

* commit '2581af9b08ac913465303795745c3ce24eb0f20c':
  add up button support for filmstrip

10 years agoam 1b44336b: Merge "Let the Camera app remember which mode it was started in last...
Sascha Haeberling [Fri, 30 Aug 2013 22:56:30 +0000 (15:56 -0700)]
am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad

* commit '1b44336b29d2145eaaf0786be47c08e2b5304bcf':
  Let the Camera app remember which mode it was started in last.

10 years agoam 6447ef1e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Aug 2013 22:56:29 +0000 (15:56 -0700)]
am 6447ef1e: (-s ours) Import translations. DO NOT MERGE

* commit '6447ef1e7cef4dad424f9e91c8fb730a6c8d0376':
  Import translations. DO NOT MERGE

10 years agoam b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos...
Doris Liu [Fri, 30 Aug 2013 22:56:29 +0000 (15:56 -0700)]
am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad

* commit 'b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123':
  Fix gap between camera controls and nav bar

10 years agoam c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photo...
Sascha Haeberling [Fri, 30 Aug 2013 22:56:28 +0000 (15:56 -0700)]
am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad

* commit 'c09c5f0328a28ccfe9a0a9b37d028e91a94ded94':
  Fix of memory issues with bitmaps in filmstrip.

10 years agoAdd back button handlng to CameraActivity.
Alan Newberger [Fri, 30 Aug 2013 22:19:48 +0000 (15:19 -0700)]
Add back button handlng to CameraActivity.

This CL first detects whether user is in filmstrip mode i.e. not in Camera,
if so brings user back to the first item which is the Camera. If in Camera,
we route back handling to the current Camera module which enables already-
written module handling for back button e.g. backing out of pie menus.

Bug: 8781981
Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a

10 years agoMerge "add up button support for filmstrip" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 30 Aug 2013 21:22:55 +0000 (21:22 +0000)]
Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad

10 years agoadd up button support for filmstrip
Alan Newberger [Fri, 23 Aug 2013 17:10:30 +0000 (10:10 -0700)]
add up button support for filmstrip

This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed.

Bug: 10414498
Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71

10 years agoMerge "Let the Camera app remember which mode it was started in last." into gb-ub...
Sascha Haeberling [Fri, 30 Aug 2013 17:24:38 +0000 (17:24 +0000)]
Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 30 Aug 2013 03:32:08 +0000 (20:32 -0700)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
Doris Liu [Fri, 30 Aug 2013 01:54:47 +0000 (01:54 +0000)]
Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad

10 years agoFix gap between camera controls and nav bar
Doris Liu [Fri, 30 Aug 2013 01:06:45 +0000 (18:06 -0700)]
Fix gap between camera controls and nav bar

Bug: 10097187
Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408

10 years agoMerge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
Sascha Haeberling [Fri, 30 Aug 2013 00:47:49 +0000 (00:47 +0000)]
Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad