git.osdn.net Git - android-x86/packages-apps-Camera2.git/log

Baligh Uddin [Sat, 5 Oct 2013 03:44:11 +0000 (20:44 -0700)]

am 47becad6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '47becad6bf644c2f12522fc6968b627192cc3368':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 03:40:18 +0000 (03:40 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-ub-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 02:24:23 +0000 (19:24 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

ztenghui [Fri, 4 Oct 2013 21:59:51 +0000 (14:59 -0700)]

am d094939d: am e0c413ca: am 4ab4879e: Don\'t show the option for Gcam when using front camera.

* commit 'd094939d9b99b403514fe0c30cbaed670a947685':
Don't show the option for Gcam when using front camera.

commit | commitdiff | tree

ztenghui [Fri, 4 Oct 2013 21:56:06 +0000 (14:56 -0700)]

am e0c413ca: am 4ab4879e: Don\'t show the option for Gcam when using front camera.

* commit 'e0c413cad04e3551bc1e10a878439f9336b295bf':
Don't show the option for Gcam when using front camera.

commit | commitdiff | tree

ztenghui [Fri, 4 Oct 2013 21:53:23 +0000 (14:53 -0700)]

am 4ab4879e: Don\'t show the option for Gcam when using front camera.

* commit '4ab4879eec785faf40ccb346b96963f04af9b0e6':
Don't show the option for Gcam when using front camera.

commit | commitdiff | tree

ztenghui [Fri, 4 Oct 2013 21:13:31 +0000 (14:13 -0700)]

Don't show the option for Gcam when using front camera.

bug:11051221

Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d

commit | commitdiff | tree

Sascha Haeberling [Fri, 4 Oct 2013 20:34:01 +0000 (13:34 -0700)]

am 8db842dc: am 872257af: am 18709218: Update the HDR+ assets.

* commit '8db842dc2447b0c705e97916a3d4d655b5d83f9b':
Update the HDR+ assets.

commit | commitdiff | tree

Sascha Haeberling [Fri, 4 Oct 2013 19:02:47 +0000 (12:02 -0700)]

am 872257af: am 18709218: Update the HDR+ assets.

* commit '872257af9a5d5300963d9335c54b292d34093d8a':
Update the HDR+ assets.

commit | commitdiff | tree

Sascha Haeberling [Fri, 4 Oct 2013 18:59:52 +0000 (11:59 -0700)]

am 18709218: Update the HDR+ assets.

* commit '187092180b3af64b5d7c2197d1054a860f7cbf45':
Update the HDR+ assets.

commit | commitdiff | tree

Sascha Haeberling [Fri, 4 Oct 2013 18:38:24 +0000 (11:38 -0700)]

Update the HDR+ assets.

Bug: 11047147

Change-Id: I680d9a822876655d3c30715a9315a17b8db87763

commit | commitdiff | tree

Doris Liu [Fri, 4 Oct 2013 04:30:14 +0000 (21:30 -0700)]

am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

* commit '5e233f829888b2a4bedbf30b57cce400539fe1eb':
Prevent picture taking via volumn key in filmstrip mode

commit | commitdiff | tree

Doris Liu [Fri, 4 Oct 2013 04:27:23 +0000 (21:27 -0700)]

am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

* commit '309cd179b821f63b25e5ebae556b38daabab1708':
Prevent picture taking via volumn key in filmstrip mode

commit | commitdiff | tree

Doris Liu [Fri, 4 Oct 2013 04:24:36 +0000 (21:24 -0700)]

am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

* commit 'b0fbd5437cc67ce10e8f4b2a7318d4cc97110976':
Prevent picture taking via volumn key in filmstrip mode

commit | commitdiff | tree

Doris Liu [Fri, 4 Oct 2013 00:08:20 +0000 (00:08 +0000)]

Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Doris Liu [Thu, 3 Oct 2013 22:31:40 +0000 (15:31 -0700)]

Prevent picture taking via volumn key in filmstrip mode

Bug: 11045068
Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:42:11 +0000 (15:42 -0700)]

am 2e2467c3: am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad

* commit '2e2467c3f87f01aa673ef987fa11492293d18c17':
Sync Camera2 permissions to GoogleCamera permissions.

commit | commitdiff | tree

Erin Dahlgren [Thu, 3 Oct 2013 22:41:53 +0000 (15:41 -0700)]

am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad

* commit 'f56cc71eb5b0373b67729f5eb5f59dc1927b951d':
Make space for photosphere rendering text

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:41:53 +0000 (15:41 -0700)]

am 67747e3d: am 6b879500: am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad

* commit '67747e3d000e9379b698d394c3d6d87ff4bd028d':
Change icons and code from HQ to HDR+ mode.

commit | commitdiff | tree

Angus Kong [Thu, 3 Oct 2013 22:41:43 +0000 (15:41 -0700)]

am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad

* commit '2e63f2e6779efd681dddcb36ff7d108cd92004fd':
Don't allow actions on items in progress.

commit | commitdiff | tree

Doris Liu [Thu, 3 Oct 2013 22:41:39 +0000 (15:41 -0700)]

am 37c96ec8: am 67510532: am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad

* commit '37c96ec8af4487fa0545a6d367f8117a4f701242':
Leave ROI not set except in tap-to-focus scenario

commit | commitdiff | tree

Kevin Gabayan [Thu, 3 Oct 2013 22:41:06 +0000 (15:41 -0700)]

am c421586c: am 5ed30cb7: am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad

* commit 'c421586c285feada482c858ba1b14e9340ff83f8':
Camera2 icon update for all resolutions.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:41:05 +0000 (15:41 -0700)]

am 3c3c63ea: am 644c534f: am 623b74b6: Add HDR+ mode strings (to replace HQ mode)

* commit '3c3c63eae242d313b9dd0a59e34f28adecfedfe5':
Add HDR+ mode strings (to replace HQ mode)

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:41:05 +0000 (15:41 -0700)]

am 98461dca: am 8a605fad: am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad

* commit '98461dcaff1ec0880714a4fa22a5e4de9445e1e8':
Add missing crop message.

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 22:41:04 +0000 (15:41 -0700)]

am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '27408847ed867399fed01515848d3cd93a4d343f':
Only show delete action when in secure camera mode.

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 22:40:59 +0000 (15:40 -0700)]

am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit 'd915fa042edd436dd819ac889f523da452bf37ae':
Show the delete button if there is room in action bar.

commit | commitdiff | tree

Mangesh Ghiware [Thu, 3 Oct 2013 22:40:58 +0000 (15:40 -0700)]

am ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit 'ac63f9c493d6b755a5bfc106d603ce850b2443de':
Exit Camera on Up button if no APP_GALLERY handler found.

commit | commitdiff | tree

Baligh Uddin [Thu, 3 Oct 2013 22:40:58 +0000 (15:40 -0700)]

am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:11:38 +0000 (15:11 -0700)]

am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad

* commit '7c1ae08c1dfcfbae45f3d4692adee6140386eebd':
Sync Camera2 permissions to GoogleCamera permissions.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:09:39 +0000 (15:09 -0700)]

am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad

* commit '7ba4a88eb78fc41717275de25748f5cf17915f5b':
Sync Camera2 permissions to GoogleCamera permissions.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 22:07:15 +0000 (22:07 +0000)]

Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Erin Dahlgren [Thu, 3 Oct 2013 21:08:39 +0000 (14:08 -0700)]

am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad

* commit '88b31b0940459f79204086d567a8aaad0a842f89':
Make space for photosphere rendering text

commit | commitdiff | tree

Erin Dahlgren [Thu, 3 Oct 2013 21:06:32 +0000 (14:06 -0700)]

am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad

* commit '77dd14930b24816369560a73cfb0610c1f745d05':
Make space for photosphere rendering text

commit | commitdiff | tree

Erin Dahlgren [Thu, 3 Oct 2013 21:05:16 +0000 (21:05 +0000)]

Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 20:56:40 +0000 (13:56 -0700)]

am 6b879500: am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad

* commit '6b879500209fb3f187141ece2bed39537a697aa1':
Change icons and code from HQ to HDR+ mode.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 20:52:18 +0000 (13:52 -0700)]

am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad

* commit '238799e97077ee72a53a5a04d9d3068aebb82bf7':
Change icons and code from HQ to HDR+ mode.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 20:47:44 +0000 (20:47 +0000)]

Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Angus Kong [Thu, 3 Oct 2013 20:46:33 +0000 (13:46 -0700)]

am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad

* commit '5f16c14039b2c97492b03f27c45e5ea01aa0b557':
Don't allow actions on items in progress.

commit | commitdiff | tree

Angus Kong [Thu, 3 Oct 2013 20:44:02 +0000 (13:44 -0700)]

am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad

* commit '5bca6f4cf43732edf459010f418d3719e07f3c8a':
Don't allow actions on items in progress.

commit | commitdiff | tree

Angus Kong [Thu, 3 Oct 2013 20:42:15 +0000 (20:42 +0000)]

Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Doris Liu [Thu, 3 Oct 2013 20:26:42 +0000 (13:26 -0700)]

am 67510532: am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad

* commit '67510532c164801a1bc995942f44e21453b3e1d4':
Leave ROI not set except in tap-to-focus scenario

commit | commitdiff | tree

Doris Liu [Thu, 3 Oct 2013 20:22:50 +0000 (13:22 -0700)]

am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad

* commit '930b9b41185a2f59c05fe527300248776d3993a0':
Leave ROI not set except in tap-to-focus scenario

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 23:53:40 +0000 (16:53 -0700)]

Don't allow actions on items in progress.

bug:11049529

Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd

commit | commitdiff | tree

Doris Liu [Thu, 3 Oct 2013 19:38:16 +0000 (19:38 +0000)]

Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 19:10:48 +0000 (12:10 -0700)]

Change icons and code from HQ to HDR+ mode.

Bug: 11047147

Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23

commit | commitdiff | tree

Kevin Gabayan [Thu, 3 Oct 2013 19:20:15 +0000 (12:20 -0700)]

am 5ed30cb7: am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad

* commit '5ed30cb77f6e73995f3acf8bb00a2a28fd8e6ed1':
Camera2 icon update for all resolutions.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 19:19:58 +0000 (12:19 -0700)]

am 644c534f: am 623b74b6: Add HDR+ mode strings (to replace HQ mode)

* commit '644c534f6b1d37a8fdd4c1d8f0e243ad13690204':
Add HDR+ mode strings (to replace HQ mode)

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 19:19:42 +0000 (12:19 -0700)]

am 8a605fad: am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad

* commit '8a605fad65487973449f629bcf6e396f2d79ad3c':
Add missing crop message.

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 19:19:32 +0000 (12:19 -0700)]

am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '9a09d511ce26df0bb81a3fc3b61d68356c790860':
Only show delete action when in secure camera mode.

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 19:19:31 +0000 (12:19 -0700)]

am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit 'cd324a25d3c97a7fc4bc22c2ab12408d3d5e2ac2':
Show the delete button if there is room in action bar.

commit | commitdiff | tree

Mangesh Ghiware [Thu, 3 Oct 2013 19:19:20 +0000 (12:19 -0700)]

am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit '893981de1e8359f15ade64ce81f5d8efc35581eb':
Exit Camera on Up button if no APP_GALLERY handler found.

commit | commitdiff | tree

Baligh Uddin [Thu, 3 Oct 2013 19:19:12 +0000 (12:19 -0700)]

am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

commit | commitdiff | tree

Erin Dahlgren [Thu, 3 Oct 2013 18:49:30 +0000 (11:49 -0700)]

Make space for photosphere rendering text

Bug: 11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb

commit | commitdiff | tree

Doris Liu [Thu, 3 Oct 2013 18:00:59 +0000 (11:00 -0700)]

Leave ROI not set except in tap-to-focus scenario

Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9

commit | commitdiff | tree

Kevin Gabayan [Thu, 3 Oct 2013 17:57:39 +0000 (10:57 -0700)]

am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad

* commit '68fc363bd33a9e506ccfd1ffa330c4525a2734ce':
Camera2 icon update for all resolutions.

commit | commitdiff | tree

Kevin Gabayan [Thu, 3 Oct 2013 17:54:51 +0000 (17:54 +0000)]

Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 17:26:08 +0000 (10:26 -0700)]

am 623b74b6: Add HDR+ mode strings (to replace HQ mode)

* commit '623b74b608fae83034bab58331fc705b8cfecaa6':
Add HDR+ mode strings (to replace HQ mode)

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 06:00:46 +0000 (23:00 -0700)]

Add HDR+ mode strings (to replace HQ mode)

Bug: 11047147

Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 16:51:40 +0000 (09:51 -0700)]

am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad

* commit '3393a62797fa397823eba720b3f52d39ae065739':
Add missing crop message.

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 16:49:56 +0000 (16:49 +0000)]

Merge "Add missing crop message." into gb-ub-photos-carlsbad

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 16:04:23 +0000 (09:04 -0700)]

am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd':
Only show delete action when in secure camera mode.

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 16:04:23 +0000 (09:04 -0700)]

am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit '9ac97492cafafc02357de21074d95b29d55d2e9f':
Show the delete button if there is room in action bar.

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 16:02:44 +0000 (16:02 +0000)]

Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 16:02:32 +0000 (16:02 +0000)]

Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 07:01:12 +0000 (00:01 -0700)]

Add missing crop message.

Bug: 11021907

Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4

commit | commitdiff | tree

Mangesh Ghiware [Thu, 3 Oct 2013 04:18:11 +0000 (21:18 -0700)]

am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit '4f563f1d91b381ff840e84c52d548194517f6b4c':
Exit Camera on Up button if no APP_GALLERY handler found.

commit | commitdiff | tree

Mangesh Ghiware [Thu, 3 Oct 2013 04:15:47 +0000 (04:15 +0000)]

Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Baligh Uddin [Thu, 3 Oct 2013 04:03:00 +0000 (04:03 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Kevin Gabayan [Thu, 3 Oct 2013 01:25:05 +0000 (18:25 -0700)]

Camera2 icon update for all resolutions.

Bug: 11048341
Change-Id: I71bf09eed24aa23e30eaf8c9bf4add8c0d1835b1

commit | commitdiff | tree

ztenghui [Thu, 3 Oct 2013 00:31:47 +0000 (17:31 -0700)]

Only show delete action when in secure camera mode.

bug:11048260
Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c

commit | commitdiff | tree

Baligh Uddin [Thu, 3 Oct 2013 00:29:37 +0000 (17:29 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Sascha Haeberling [Thu, 3 Oct 2013 00:17:29 +0000 (17:17 -0700)]

Sync Camera2 permissions to GoogleCamera permissions.

Bug: 10951073

Excluding the Gallery3d and gservices permissions.

Change-Id: If6508114a47e1a793a2b4caab81437242907f8d2

commit | commitdiff | tree

ztenghui [Wed, 2 Oct 2013 20:31:35 +0000 (13:31 -0700)]

Show the delete button if there is room in action bar.

bug:10731828

Change-Id: I251593bcbfc8547d1bc445a56f3cd7fd3dd4acf3

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 22:55:20 +0000 (15:55 -0700)]

am 81fa3622: am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

* commit '81fa362246bed290463f94fdba71a989d796ef94':
Increase char limit for camera timer sound message.

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 22:53:48 +0000 (15:53 -0700)]

am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

* commit 'f8b53c38e933bf9290f727fbf6532839e917fee4':
Increase char limit for camera timer sound message.

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 22:52:01 +0000 (15:52 -0700)]

am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

* commit 'c60e2b096886e36580c6ecfedd037dcf21130ed3':
Increase char limit for camera timer sound message.

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 22:49:21 +0000 (22:49 +0000)]

Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Mangesh Ghiware [Wed, 2 Oct 2013 21:38:12 +0000 (14:38 -0700)]

Exit Camera on Up button if no APP_GALLERY handler found.

Bug: 11047289
Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Oct 2013 21:37:04 +0000 (14:37 -0700)]

am 826b0631: am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

* commit '826b06319f634332c56873db602d80aa14c7bab9':
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 21:37:04 +0000 (14:37 -0700)]

am 81f859df: am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

* commit '81f859dfe54b5884b9641726f463ddc5dac5424e':
Make scroll animation smoother.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Oct 2013 21:34:36 +0000 (14:34 -0700)]

am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

* commit '03b10508d51f03695d91268826a4044f24929340':
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 21:34:36 +0000 (14:34 -0700)]

am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

* commit '632afc196121cb15a53b4cffd3b93df4fcd39f46':
Make scroll animation smoother.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Oct 2013 21:28:24 +0000 (14:28 -0700)]

am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

* commit 'cf7babd5cbe69cf99d96e46c306d6733837f48eb':
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 21:28:24 +0000 (14:28 -0700)]

am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

* commit '45f5976f2c1d4eda46be4ea591c6196c683f2ded':
Make scroll animation smoother.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Oct 2013 20:36:06 +0000 (20:36 +0000)]

Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 20:18:25 +0000 (20:18 +0000)]

Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 16:37:04 +0000 (09:37 -0700)]

am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit '3c45c0c0b250eecd2a589a3616a14dea195564a8':
Deactivate the backup agent in Camera2

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 16:37:03 +0000 (09:37 -0700)]

am 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad

* commit '5a55e6b8a63e6f5a287ccc7c3099423e5e5fa30b':
Add content description to post-capture thumbnail.

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Oct 2013 16:36:46 +0000 (09:36 -0700)]

am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad

* commit 'b763357340619b188d0d536e31c5e7ddbcfec595':
Fix FilmStrip crash by checking if photos are present before updating action bar

commit | commitdiff | tree

Doris Liu [Wed, 2 Oct 2013 16:36:43 +0000 (09:36 -0700)]

am c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash in zoom view

* commit 'c4810a331b4420a18e8925afd61b0a0006943704':
A workaround for crash in zoom view

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 16:35:37 +0000 (09:35 -0700)]

am ee7f3963: am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling.

* commit 'ee7f3963c8fcb44ff8d1d1864ac480664f3f645c':
Prevent NPE in gesture handling.

commit | commitdiff | tree

Doris Liu [Wed, 2 Oct 2013 16:35:19 +0000 (09:35 -0700)]

am 6f2be56c: am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad

* commit '6f2be56cad8a8963f351eb8d21996a9c222a6f60':
Double tap to full screen from filmstrip

commit | commitdiff | tree

Erin Dahlgren [Wed, 2 Oct 2013 16:35:08 +0000 (09:35 -0700)]

am ee8d0e11: am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad

* commit 'ee8d0e11a987bb5b12f0b760a918913c7a1661d0':
Updates newly centered photos in FilmStrip after a delete.

commit | commitdiff | tree

Baligh Uddin [Wed, 2 Oct 2013 16:34:42 +0000 (09:34 -0700)]

am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

commit | commitdiff | tree

Angus Kong [Wed, 2 Oct 2013 16:34:40 +0000 (09:34 -0700)]

am 85be0ac8: am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad

* commit '85be0ac807789a8d02ab900de179adbef5c865cb':
Don't adjust the position while scrolling.

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 16:34:40 +0000 (09:34 -0700)]

am 7334597f: am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad

* commit '7334597fcc93679d49d15e3922887496b17cb3cd':
Show status bar in filmstrip mode

commit | commitdiff | tree

Angus Kong [Tue, 1 Oct 2013 23:58:52 +0000 (16:58 -0700)]

Make scroll animation smoother.

bug:10802703

Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4

commit | commitdiff | tree

ztenghui [Wed, 2 Oct 2013 05:21:40 +0000 (22:21 -0700)]

am 293cf7e4: am 4feabff8: Fix MediaStore correction code.

* commit '293cf7e4030fc029911386b4da9f1805aafa8ba5':
Fix MediaStore correction code.

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 05:21:40 +0000 (22:21 -0700)]

am 9c9244fc: am c4aa7c0e: Change crop label to avoid aapt dump badging from failing.

* commit '9c9244fceb36344594946360c8b00cf62539f19f':
Change crop label to avoid aapt dump badging from failing.

commit | commitdiff | tree

Sascha Haeberling [Wed, 2 Oct 2013 01:16:41 +0000 (18:16 -0700)]

am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad

* commit 'b8968f2ce791c437322c25ef6e6fdc9d0fa10d65':
Deactivate the backup agent in Camera2