OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 90da6872: am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related...
ztenghui [Wed, 9 Oct 2013 20:34:25 +0000 (13:34 -0700)]
am 90da6872: am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad

* commit '90da6872aa443c7d54d46f9ac0680f014f9ae53c':
  Fix another potential issue related to video capture intent.

10 years agoam 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture...
ztenghui [Wed, 9 Oct 2013 20:29:12 +0000 (13:29 -0700)]
am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad

* commit '3cac767e2fafccd565761b7677f554d680c72de3':
  Fix another potential issue related to video capture intent.

10 years agoam 3152c957: am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI...
Doris Liu [Wed, 9 Oct 2013 20:27:33 +0000 (13:27 -0700)]
am 3152c957: am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad

* commit '3152c957ff7cf8ddaabe256363b2fbafe7b4a078':
  Workaround to disable swiping for SRI during capture

10 years agoam 70d24b5b: Merge "Fix another potential issue related to video capture intent....
ztenghui [Wed, 9 Oct 2013 20:27:17 +0000 (13:27 -0700)]
am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad

* commit '70d24b5b602ae56784d7f7bd6d79af7d37095553':
  Fix another potential issue related to video capture intent.

10 years agoam 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture...
Doris Liu [Wed, 9 Oct 2013 20:25:46 +0000 (13:25 -0700)]
am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad

* commit '7c2e7ccef29aa272f183b90a4890e3ce5e6526f2':
  Workaround to disable swiping for SRI during capture

10 years agoMerge "Fix another potential issue related to video capture intent." into gb-ub-photo...
ztenghui [Wed, 9 Oct 2013 20:24:27 +0000 (20:24 +0000)]
Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad

10 years agoam ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb...
Doris Liu [Wed, 9 Oct 2013 20:24:12 +0000 (13:24 -0700)]
am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad

* commit 'ef4dccf65c1077b8c7f28c26c9c2038c975fd94c':
  Workaround to disable swiping for SRI during capture

10 years agoMerge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad
Doris Liu [Wed, 9 Oct 2013 20:22:48 +0000 (20:22 +0000)]
Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad

10 years agoam c3075c38: am 82223508: am 26862c30: Update bottom controls and action bar with...
Erin Dahlgren [Wed, 9 Oct 2013 20:14:10 +0000 (13:14 -0700)]
am c3075c38: am 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds on data change.

* commit 'c3075c38cb8d7175ad5852348bc0ab2503c17086':
  Update bottom controls and action bar with a tighter bounds on data change.

10 years agoam 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds...
Erin Dahlgren [Wed, 9 Oct 2013 20:11:29 +0000 (13:11 -0700)]
am 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds on data change.

* commit '82223508f8a30bf30577cad5760db8ceff35586a':
  Update bottom controls and action bar with a tighter bounds on data change.

10 years agoam 26862c30: Update bottom controls and action bar with a tighter bounds on data...
Erin Dahlgren [Wed, 9 Oct 2013 20:09:05 +0000 (13:09 -0700)]
am 26862c30: Update bottom controls and action bar with a tighter bounds on data change.

* commit '26862c304a8163016b1f8196c715769750ba1720':
  Update bottom controls and action bar with a tighter bounds on data change.

10 years agoUpdate bottom controls and action bar with a tighter bounds on data change.
Erin Dahlgren [Wed, 9 Oct 2013 17:59:47 +0000 (10:59 -0700)]
Update bottom controls and action bar with a tighter bounds on data change.

Bug: 11087361
Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d

10 years agoWorkaround to disable swiping for SRI during capture
Doris Liu [Wed, 9 Oct 2013 18:45:36 +0000 (11:45 -0700)]
Workaround to disable swiping for SRI during capture

Bug: 11139101
Change-Id: I2cfc9fb94259755e3db6f5d0b80287388cb846de

10 years agoFix another potential issue related to video capture intent.
ztenghui [Wed, 9 Oct 2013 17:52:33 +0000 (10:52 -0700)]
Fix another potential issue related to video capture intent.

We don't want to delete the Uri sent from the intent.
When we are in review mode, the mCurrentVideoUri should be from the capture
result.

bug:11136978
Change-Id: I148135326e3516936f7d6463941c6b50dbc389db

10 years agoam e158f707: am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub...
ztenghui [Wed, 9 Oct 2013 16:24:46 +0000 (09:24 -0700)]
am e158f707: am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

* commit 'e158f707136e028a3afb8aff28de566db5468e81':
  Fix NPE in video intent.

10 years agoam 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
ztenghui [Wed, 9 Oct 2013 16:21:26 +0000 (09:21 -0700)]
am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

* commit '676b89cab6e9db1b784617fc16e97eadac7c4e2d':
  Fix NPE in video intent.

10 years agoam 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
ztenghui [Wed, 9 Oct 2013 16:18:08 +0000 (09:18 -0700)]
am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

* commit '52beb04d45ff906dfaffb1799a6d93859f1d83bd':
  Fix NPE in video intent.

10 years agoMerge "Fix NPE in video intent." into gb-ub-photos-carlsbad
ztenghui [Wed, 9 Oct 2013 16:15:13 +0000 (16:15 +0000)]
Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

10 years agoam 2393fa30: am 59f24eeb: am 6939d143: Merge "Make the transition animation identical...
Angus Kong [Wed, 9 Oct 2013 15:59:19 +0000 (08:59 -0700)]
am 2393fa30: am 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad

* commit '2393fa305aa8fd0cf2d7c72381899b307fcd278d':
  Make the transition animation identical.

10 years agoam 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb...
Angus Kong [Wed, 9 Oct 2013 15:57:01 +0000 (08:57 -0700)]
am 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad

* commit '59f24eeb714d75658f98123928f872fe65cab0a1':
  Make the transition animation identical.

10 years agoam 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
Angus Kong [Wed, 9 Oct 2013 15:54:46 +0000 (08:54 -0700)]
am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad

* commit '6939d143cb52a012b1b9cd9a141156357367b212':
  Make the transition animation identical.

10 years agoMerge "Make the transition animation identical." into gb-ub-photos-carlsbad
Angus Kong [Wed, 9 Oct 2013 15:53:29 +0000 (15:53 +0000)]
Merge "Make the transition animation identical." into gb-ub-photos-carlsbad

10 years agoam 2df4a3c5: am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed.
Angus Kong [Wed, 9 Oct 2013 15:45:45 +0000 (08:45 -0700)]
am 2df4a3c5: am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed.

* commit '2df4a3c5748ce523f0433034b4575eb710d4c6c2':
  Enter fullscreen if all items are removed.

10 years agoam a584528f: am 6ddd31b9: Enter fullscreen if all items are removed.
Angus Kong [Wed, 9 Oct 2013 15:44:27 +0000 (08:44 -0700)]
am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed.

* commit 'a584528f0c77d383284ba6c8cc249bcad49e2be7':
  Enter fullscreen if all items are removed.

10 years agoam 6ddd31b9: Enter fullscreen if all items are removed.
Angus Kong [Wed, 9 Oct 2013 15:42:40 +0000 (08:42 -0700)]
am 6ddd31b9: Enter fullscreen if all items are removed.

* commit '6ddd31b9284bbbfcf891766f9d6238bfd5cde721':
  Enter fullscreen if all items are removed.

10 years agoMake the transition animation identical.
Angus Kong [Wed, 9 Oct 2013 03:58:33 +0000 (20:58 -0700)]
Make the transition animation identical.

The animation of transition between camera preview and filmstrip should be a
special case to prevent jank.

  bug:11011577

Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe

10 years agoEnter fullscreen if all items are removed.
Angus Kong [Wed, 9 Oct 2013 05:34:02 +0000 (22:34 -0700)]
Enter fullscreen if all items are removed.

  bug:11066937

Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90

10 years agoam 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture...
Angus Kong [Wed, 9 Oct 2013 03:04:34 +0000 (20:04 -0700)]
am 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad

* commit '7693a4f020261d20b2f48f11b842f9c095abeba5':
  Don't go into Gcam when it's capture intent.

10 years agoam 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent."...
Angus Kong [Wed, 9 Oct 2013 03:02:24 +0000 (20:02 -0700)]
am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad

* commit '762d8cb0c6e05af36893fd3eec9753e4f68b6c83':
  Don't go into Gcam when it's capture intent.

10 years agoam b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos...
Angus Kong [Wed, 9 Oct 2013 03:00:48 +0000 (20:00 -0700)]
am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad

* commit 'b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e':
  Don't go into Gcam when it's capture intent.

10 years agoMerge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad
Angus Kong [Wed, 9 Oct 2013 02:58:53 +0000 (02:58 +0000)]
Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad

10 years agoam eba2ebbd: am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view
Doris Liu [Wed, 9 Oct 2013 00:57:16 +0000 (17:57 -0700)]
am eba2ebbd: am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view

* commit 'eba2ebbd1293f6fc9d09b3a4f3dc580df6839147':
  Allow scaling beyond 1:1 in zoom view

10 years agoam 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view
Doris Liu [Wed, 9 Oct 2013 00:55:25 +0000 (17:55 -0700)]
am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view

* commit '52fab3a022a45e1a87852c1eda650d60a8633d1a':
  Allow scaling beyond 1:1 in zoom view

10 years agoam 3179f6a4: Allow scaling beyond 1:1 in zoom view
Doris Liu [Wed, 9 Oct 2013 00:52:38 +0000 (17:52 -0700)]
am 3179f6a4: Allow scaling beyond 1:1 in zoom view

* commit '3179f6a49516833761be5155c4e1244ac0aa17fe':
  Allow scaling beyond 1:1 in zoom view

10 years agoFix NPE in video intent.
ztenghui [Wed, 9 Oct 2013 00:07:15 +0000 (17:07 -0700)]
Fix NPE in video intent.

bug:11136978

Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4

10 years agoAllow scaling beyond 1:1 in zoom view
Doris Liu [Tue, 8 Oct 2013 23:54:22 +0000 (16:54 -0700)]
Allow scaling beyond 1:1 in zoom view

Bug: 10950226
Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11

10 years agoam e5543c5c: am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip...
Doris Liu [Wed, 9 Oct 2013 00:08:43 +0000 (17:08 -0700)]
am e5543c5c: am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad

* commit 'e5543c5c3c15ed3212fcc583ae3bf8dfdcbcea4b':
  Do not allow navigation to filmstrip during video recording

10 years agoam 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video...
Doris Liu [Wed, 9 Oct 2013 00:06:21 +0000 (17:06 -0700)]
am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad

* commit '89a8a1c3a85bad6b99c240364e8fad33fc7a89e2':
  Do not allow navigation to filmstrip during video recording

10 years agoam 607634ca: Merge "Do not allow navigation to filmstrip during video recording"...
Doris Liu [Wed, 9 Oct 2013 00:03:46 +0000 (17:03 -0700)]
am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad

* commit '607634cafd9a0b626de8390d855bdabe23a4738b':
  Do not allow navigation to filmstrip during video recording

10 years agoMerge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos...
Doris Liu [Wed, 9 Oct 2013 00:02:12 +0000 (00:02 +0000)]
Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad

10 years agoam fdcc07eb: am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort...
Mindy DelliCarpini [Tue, 8 Oct 2013 23:51:43 +0000 (16:51 -0700)]
am fdcc07eb: am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad

* commit 'fdcc07eb2705ab49a63b588505107404041da750':
  Update camera assets for de-blue effort

10 years agoam 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb...
Mindy DelliCarpini [Tue, 8 Oct 2013 23:49:25 +0000 (16:49 -0700)]
am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad

* commit '51d86937e76b5e07f000c790818244e748403e75':
  Update camera assets for de-blue effort

10 years agoam 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad
Mindy DelliCarpini [Tue, 8 Oct 2013 23:47:30 +0000 (16:47 -0700)]
am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad

* commit '2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5':
  Update camera assets for de-blue effort

10 years agoMerge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad
Mindy DelliCarpini [Tue, 8 Oct 2013 23:44:40 +0000 (23:44 +0000)]
Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad

10 years agoam 57067df0: am 3e69e4ee: merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:15:50 +0000 (16:15 -0700)]
am 57067df0: am 3e69e4ee: merge in KFS78N (no-op)

* commit '57067df0117b6007241bf0e647ee9f54d925998a':

10 years agoam 3e69e4ee: merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:09:29 +0000 (16:09 -0700)]
am 3e69e4ee: merge in KFS78N (no-op)

* commit '3e69e4ee9e2b532af96a331d99ef74c6044d0cf4':

10 years agomerge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 23:01:17 +0000 (16:01 -0700)]
merge in KFS78N (no-op)

10 years agoam a6f80df8: am 2c042f21: merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:58:08 +0000 (15:58 -0700)]
am a6f80df8: am 2c042f21: merge in KQS81M

* commit 'a6f80df8b0cc75ee4459550f99a8a5c60c19a857':
  Adding gcam module to Camera2 app.
  Refine Filmstrip gesture/position handling.
  Fix drawable location.
  Improve swipe gesture in filmstrip.
  Fix black screen in mode switching
  Stop the MediaSaveService after unbinding.
  Enable switching cameras in video mode.
  Handle unexpected exceptions when loading videos.

10 years agoam 2c042f21: merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:47:46 +0000 (15:47 -0700)]
am 2c042f21: merge in KQS81M

* commit '2c042f218280aa6ee8c8d0d83fe4830e104c6365':
  Adding gcam module to Camera2 app.
  Refine Filmstrip gesture/position handling.
  Fix drawable location.
  Improve swipe gesture in filmstrip.
  Fix black screen in mode switching
  Stop the MediaSaveService after unbinding.
  Enable switching cameras in video mode.
  Handle unexpected exceptions when loading videos.
  Add back DisableCameraReceiver

10 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:42:17 +0000 (15:42 -0700)]
merge in KQS81M

10 years agoam 2f0b7b19: am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips.
Angus Kong [Tue, 8 Oct 2013 22:17:11 +0000 (15:17 -0700)]
am 2f0b7b19: am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips.

* commit '2f0b7b190bf69ce496cf460895ec176fb7ac2418':
  Add shutter click sound in SoundClips.

10 years agoam 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips.
Angus Kong [Tue, 8 Oct 2013 22:14:43 +0000 (15:14 -0700)]
am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips.

* commit '3c27dd3690ee42aafdb7d19eee4f9bf50f95a47d':
  Add shutter click sound in SoundClips.

10 years agoam f5aa51e6: Add shutter click sound in SoundClips.
Angus Kong [Tue, 8 Oct 2013 22:12:05 +0000 (15:12 -0700)]
am f5aa51e6: Add shutter click sound in SoundClips.

* commit 'f5aa51e6e8da349c8f1a604b431af243cc0802c0':
  Add shutter click sound in SoundClips.

10 years agoAdd shutter click sound in SoundClips.
Angus Kong [Tue, 8 Oct 2013 21:59:18 +0000 (14:59 -0700)]
Add shutter click sound in SoundClips.

  bug:11135055

Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d

10 years agoDon't go into Gcam when it's capture intent.
Angus Kong [Tue, 8 Oct 2013 20:44:19 +0000 (13:44 -0700)]
Don't go into Gcam when it's capture intent.

  bug:11115082

Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b

10 years agoDo not allow navigation to filmstrip during video recording
Doris Liu [Tue, 8 Oct 2013 18:03:37 +0000 (11:03 -0700)]
Do not allow navigation to filmstrip during video recording

Bug: 11064867
Change-Id: I168136a193008578b3ad2642cba764650bcc2487

10 years agoam 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations...
Baligh Uddin [Tue, 8 Oct 2013 04:23:02 +0000 (21:23 -0700)]
am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev

* commit '6f1346f8a29f6d5878b65273b5f783909137e853':
  Revert "Import translations. DO NOT MERGE"

10 years agoam d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 04:20:29 +0000 (21:20 -0700)]
am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev

* commit 'd0fff8a7802505fb882bff18d3033f77bb273228':
  Revert "Import translations. DO NOT MERGE"

10 years agoam a8771ede: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp...
Baligh Uddin [Tue, 8 Oct 2013 04:19:42 +0000 (21:19 -0700)]
am a8771ede: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev

* commit 'a8771ede1ca54f2105860c57a7fc5858a80f6483':
  Revert "Import translations. DO NOT MERGE"

10 years agoMerge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
Baligh Uddin [Tue, 8 Oct 2013 04:17:45 +0000 (04:17 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev

10 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 8 Oct 2013 04:17:37 +0000 (04:17 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit fac183bec4a6a2da290e57d0c1875423a3801557.

Change-Id: I1a4c06fe958c341f1a6d6d2ee41098236ec4d30c

10 years agoMerge "Revert "Import translations. DO NOT MERGE"" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 04:17:06 +0000 (04:17 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev

10 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 8 Oct 2013 04:16:57 +0000 (04:16 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 5d00bc10562d86312bc88c34d00da20f41cc3ad9.

Change-Id: I82e49f95a3e0705a506cbb409130b19a63e582c1

10 years agoam db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 8 Oct 2013 03:58:33 +0000 (20:58 -0700)]
am db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 03:55:06 +0000 (20:55 -0700)]
am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9d8a48caf6d1ca1d8ab02800d28872211baaa334':
  Import translations. DO NOT MERGE

10 years agoam 5d0f4b37: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Tue, 8 Oct 2013 03:54:38 +0000 (20:54 -0700)]
am 5d0f4b37: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '5d0f4b37ccd900819570875f4e1316e775a7fcc9':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Tue, 8 Oct 2013 03:50:13 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 8 Oct 2013 03:50:07 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 230d79b6: am a406decd: am 94f5f216: Merge "Increase character limit." into gb...
Sascha Haeberling [Tue, 8 Oct 2013 03:34:07 +0000 (20:34 -0700)]
am 230d79b6: am a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad

* commit '230d79b66b1e54860c3078b54a59a0d8ce0d9272':
  Increase character limit.

10 years agoam a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 8 Oct 2013 03:31:21 +0000 (20:31 -0700)]
am a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad

* commit 'a406decd9d3242e4c2381eb8a6d43182089bf249':
  Increase character limit.

10 years agoam 867c6364: am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in...
Doris Liu [Tue, 8 Oct 2013 03:29:50 +0000 (20:29 -0700)]
am 867c6364: am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view

* commit '867c6364a014b08332b99864135bfce5b04bac75':
  Correct sample factor for rotated images in zoom view

10 years agoam 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 8 Oct 2013 03:29:21 +0000 (20:29 -0700)]
am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad

* commit '94f5f216821c1090bd8a0660483935456dc13df1':
  Increase character limit.

10 years agoam 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view
Doris Liu [Tue, 8 Oct 2013 03:28:03 +0000 (20:28 -0700)]
am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view

* commit '4e90efbc3187a51358ee2da1e76e55912c55ea48':
  Correct sample factor for rotated images in zoom view

10 years agoMerge "Increase character limit." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 8 Oct 2013 03:27:00 +0000 (03:27 +0000)]
Merge "Increase character limit." into gb-ub-photos-carlsbad

10 years agoam c502bc9d: Correct sample factor for rotated images in zoom view
Doris Liu [Tue, 8 Oct 2013 03:26:15 +0000 (20:26 -0700)]
am c502bc9d: Correct sample factor for rotated images in zoom view

* commit 'c502bc9d50ded1f2eec28f4809c7193ec4ec5298':
  Correct sample factor for rotated images in zoom view

10 years agoIncrease character limit.
Sascha Haeberling [Tue, 8 Oct 2013 03:09:47 +0000 (20:09 -0700)]
Increase character limit.

  Bug: 10999205
  Bug: 10558260
  Bug: 10554875

Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 02:40:59 +0000 (19:40 -0700)]
Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Oct 2013 02:40:29 +0000 (19:40 -0700)]
Import translations. DO NOT MERGE

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

10 years agoCorrect sample factor for rotated images in zoom view
Doris Liu [Tue, 8 Oct 2013 01:39:26 +0000 (18:39 -0700)]
Correct sample factor for rotated images in zoom view

Bug: 11067085
Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a

10 years agoam aaad00a7: am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent...
ztenghui [Tue, 8 Oct 2013 00:45:40 +0000 (17:45 -0700)]
am aaad00a7: am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad

* commit 'aaad00a7fd6a913569df9cf8f66475aa31b07ade':
  Keep the ImageData size info consistent with MediaStore and Exif

10 years agoam 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaSt...
ztenghui [Tue, 8 Oct 2013 00:42:27 +0000 (17:42 -0700)]
am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad

* commit '6cd0dfebcac8e262aec68d66e4cc2447da31c5d3':
  Keep the ImageData size info consistent with MediaStore and Exif

10 years agoam 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif...
ztenghui [Tue, 8 Oct 2013 00:38:40 +0000 (17:38 -0700)]
am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad

* commit '73809edd589fe54b44452cfa7c3935477d68dd5e':
  Keep the ImageData size info consistent with MediaStore and Exif

10 years agoMerge "Keep the ImageData size info consistent with MediaStore and Exif" into gb...
ztenghui [Tue, 8 Oct 2013 00:36:59 +0000 (00:36 +0000)]
Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad

10 years agoKeep the ImageData size info consistent with MediaStore and Exif
ztenghui [Mon, 7 Oct 2013 21:54:55 +0000 (14:54 -0700)]
Keep the ImageData size info consistent with MediaStore and Exif

Basically, the width and hight in the ImageData will be pre-rotation.

bug:11067085

Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858

10 years agoam 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO...
Sascha Haeberling [Mon, 7 Oct 2013 22:12:21 +0000 (15:12 -0700)]
am 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE

* commit '5dce0feec3d6345062c4ce8de5426bc23f04b572':
  Fix missing filtershow string. DO NOT MERGE

10 years agoam d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE
Sascha Haeberling [Mon, 7 Oct 2013 22:01:42 +0000 (15:01 -0700)]
am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE

* commit 'd820c0c6c28656e99db3adfd2f79a91ba7674553':
  Fix missing filtershow string. DO NOT MERGE

10 years agoam 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE
Sascha Haeberling [Mon, 7 Oct 2013 21:59:00 +0000 (14:59 -0700)]
am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE

* commit '2a2f33feffe61e2e7b5717aa05de718856f5bec0':
  Fix missing filtershow string. DO NOT MERGE

10 years agoFix missing filtershow string. DO NOT MERGE
Sascha Haeberling [Mon, 7 Oct 2013 20:49:01 +0000 (13:49 -0700)]
Fix missing filtershow string. DO NOT MERGE

  Bug: 11116778

Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56

10 years agoam 8f850b1b: am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml...
Baligh Uddin [Mon, 7 Oct 2013 16:07:43 +0000 (09:07 -0700)]
am 8f850b1b: am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev

* commit '8f850b1b6e805fc339cdba0e6440c3ef96d67937':
  Revert "Remove translated filtershow_strings.xml files."

10 years agoam eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into...
Baligh Uddin [Mon, 7 Oct 2013 16:04:54 +0000 (09:04 -0700)]
am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev

* commit 'eb418dba6be5cbbeebd29f514be365a19b8f6c50':
  Revert "Remove translated filtershow_strings.xml files."

10 years agoMerge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev
Baligh Uddin [Mon, 7 Oct 2013 16:02:08 +0000 (16:02 +0000)]
Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev

10 years agoRevert "Remove translated filtershow_strings.xml files."
Baligh Uddin [Mon, 7 Oct 2013 16:01:37 +0000 (16:01 +0000)]
Revert "Remove translated filtershow_strings.xml files."

This reverts commit b17ba7b90fc7ad2d4a12ba5bf86a0b0bd04c6900.

Change-Id: Ib5bc636f29af4dee5c4bca520fb3d183187a1b7a

10 years agoam 1bb8a000: am 591fbff2: Merge "Remove translated filtershow_strings.xml files....
Baligh Uddin [Mon, 7 Oct 2013 15:11:54 +0000 (08:11 -0700)]
am 1bb8a000: am 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev

* commit '1bb8a000fa9c11c32a8054c2821edeedbaeb8de7':
  Remove translated filtershow_strings.xml files.

10 years agoam 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev
Baligh Uddin [Mon, 7 Oct 2013 15:10:10 +0000 (08:10 -0700)]
am 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev

* commit '591fbff2c04639e1223176d05eaabdae6f4ba1fe':
  Remove translated filtershow_strings.xml files.

10 years agoMerge "Remove translated filtershow_strings.xml files." into klp-dev
Baligh Uddin [Mon, 7 Oct 2013 15:08:43 +0000 (15:08 +0000)]
Merge "Remove translated filtershow_strings.xml files." into klp-dev

10 years agoam 5eaa6237: am b439aa31: am 4de78806: Revert CL that added broadcast receivers for...
Sascha Haeberling [Mon, 7 Oct 2013 01:52:40 +0000 (18:52 -0700)]
am 5eaa6237: am b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control.

* commit '5eaa6237049dc895356e1f55c2317f1a67b013eb':
  Revert CL that added broadcast receivers for shutter control.

10 years agoam afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev
Baligh Uddin [Mon, 7 Oct 2013 01:52:40 +0000 (18:52 -0700)]
am afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev

* commit 'afcf9bbdef0cec0a5bbdc399b6fb4f9c09aaa648':
  Build broken.

10 years agoam b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control.
Sascha Haeberling [Mon, 7 Oct 2013 01:49:43 +0000 (18:49 -0700)]
am b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control.

* commit 'b439aa3109b58f3e823db41e369f462e5b0d7e70':
  Revert CL that added broadcast receivers for shutter control.

10 years agoam e5b45eaf: (-s ours) Merge "Build broken." into klp-dev
Baligh Uddin [Mon, 7 Oct 2013 01:49:42 +0000 (18:49 -0700)]
am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev

* commit 'e5b45eafa6c19865045c5c867399ea4bbb692638':
  Build broken.

10 years agoam 4de78806: Revert CL that added broadcast receivers for shutter control.
Sascha Haeberling [Mon, 7 Oct 2013 01:45:55 +0000 (18:45 -0700)]
am 4de78806: Revert CL that added broadcast receivers for shutter control.

* commit '4de788063b51cc2d3f65122bdcc7f862170ba761':
  Revert CL that added broadcast receivers for shutter control.