OSDN Git Service
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
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
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
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
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
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
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
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
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
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."
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."
Baligh Uddin [Mon, 7 Oct 2013 16:02:08 +0000 (16:02 +0000)]
Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev
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
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.
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.
Baligh Uddin [Mon, 7 Oct 2013 15:08:43 +0000 (15:08 +0000)]
Merge "Remove translated filtershow_strings.xml files." into klp-dev
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.
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.
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.
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.
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.
Sascha Haeberling [Mon, 7 Oct 2013 01:07:07 +0000 (18:07 -0700)]
Revert CL that added broadcast receivers for shutter control.
Bug:
11006189
This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589
Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
Baligh Uddin [Sat, 5 Oct 2013 16:37:02 +0000 (09:37 -0700)]
am
bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
* commit '
bf33451ece2d872aa5dfc770a694a4f57432698b':
Build broken Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 5 Oct 2013 16:37:02 +0000 (09:37 -0700)]
am
4bb6f6e2: (-s ours) am
57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4bb6f6e2d56fb6b42bfb63a8e75fa77018cfde1a':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Oct 2013 05:04:47 +0000 (22:04 -0700)]
Remove translated filtershow_strings.xml files.
Baligh Uddin [Sat, 5 Oct 2013 04:22:03 +0000 (04:22 +0000)]
Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 04:21:56 +0000 (04:21 +0000)]
Build broken
Revert "Import translations. DO NOT MERGE"
This reverts commit
fa80b8d06fc1d4cc449805f090e77e852209da06.
Change-Id: I9d5a49f235e9150dc78239892cfb32460c115121
Baligh Uddin [Sat, 5 Oct 2013 04:08:40 +0000 (04:08 +0000)]
Merge "Build broken." into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 04:08:30 +0000 (04:08 +0000)]
Build broken.
Revert "Import translations. DO NOT MERGE"
This reverts commit
0028336423130a5a0227cd932d3295581f83dd22.
Change-Id: Id3638d0d093d03c037d30a3b1f49e242ff67af85
Baligh Uddin [Sat, 5 Oct 2013 03:44:46 +0000 (20:44 -0700)]
am
57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
57913c823cdba83a1171efea3ef3546fa2bbf670':
Import translations. DO NOT MERGE
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
Baligh Uddin [Sat, 5 Oct 2013 03:40:18 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Oct 2013 03:40:11 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
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
Baligh Uddin [Sat, 5 Oct 2013 02:23:48 +0000 (19:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie6c099841e72853be3243fffc8d6c266c8c802da
Auto-generated-cl: translation import
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.
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.
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.
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
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.
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.
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.
Sascha Haeberling [Fri, 4 Oct 2013 18:38:24 +0000 (11:38 -0700)]
Update the HDR+ assets.
Bug:
11047147
Change-Id: I680d9a822876655d3c30715a9315a17b8db87763
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
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
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
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
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
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.
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
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.
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.
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
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.
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)
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.
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.
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.
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.
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
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.
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.
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
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
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
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
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.
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.
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
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.
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.
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
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
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
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
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
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
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.
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)
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.
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.
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.
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.
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
Erin Dahlgren [Thu, 3 Oct 2013 18:49:30 +0000 (11:49 -0700)]
Make space for photosphere rendering text
Bug:
11005014
Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
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
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.
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
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)
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
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.
Sascha Haeberling [Thu, 3 Oct 2013 16:49:56 +0000 (16:49 +0000)]
Merge "Add missing crop message." into gb-ub-photos-carlsbad
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.
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.
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
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
Sascha Haeberling [Thu, 3 Oct 2013 07:01:12 +0000 (00:01 -0700)]
Add missing crop message.
Bug:
11021907
Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
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.
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
Baligh Uddin [Thu, 3 Oct 2013 04:03:00 +0000 (04:03 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
OSDN Git Service
