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

Erin Dahlgren [Wed, 9 Oct 2013 22:47:36 +0000 (15:47 -0700)]

am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

* commit '716860487554b5e214d355f88effc9b8c316d54e':
Update bottom edit control for photos inside secure and insecure mode.

commit | commitdiff | tree

Erin Dahlgren [Wed, 9 Oct 2013 22:45:03 +0000 (22:45 +0000)]

Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Erin Dahlgren [Wed, 9 Oct 2013 20:55:08 +0000 (13:55 -0700)]

Update bottom edit control for photos inside secure and insecure mode.

Bug: 11067201
Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

ztenghui [Wed, 9 Oct 2013 16:15:13 +0000 (16:15 +0000)]

Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad

commit | commitdiff | tree

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.

commit | commitdiff | tree

Angus Kong [Wed, 9 Oct 2013 15:53:29 +0000 (15:53 +0000)]

Merge "Make the transition animation identical." into gb-ub-photos-carlsbad

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

ztenghui [Wed, 9 Oct 2013 00:07:15 +0000 (17:07 -0700)]

Fix NPE in video intent.

bug:11136978

Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ed Heyl [Tue, 8 Oct 2013 23:01:17 +0000 (16:01 -0700)]

merge in KFS78N (no-op)

commit | commitdiff | tree

Ed Heyl [Tue, 8 Oct 2013 22:42:17 +0000 (15:42 -0700)]

commit | commitdiff | tree

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.

commit | commitdiff | tree

Angus Kong [Tue, 8 Oct 2013 21:59:18 +0000 (14:59 -0700)]

Add shutter click sound in SoundClips.

bug:11135055

Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 04:17:06 +0000 (04:17 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Tue, 8 Oct 2013 03:50:07 +0000 (03:50 +0000)]

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Sascha Haeberling [Tue, 8 Oct 2013 03:27:00 +0000 (03:27 +0000)]

Merge "Increase character limit." into gb-ub-photos-carlsbad

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 7 Oct 2013 16:02:08 +0000 (16:02 +0000)]

Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 7 Oct 2013 15:08:43 +0000 (15:08 +0000)]

Merge "Remove translated filtershow_strings.xml files." into klp-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 05:04:47 +0000 (22:04 -0700)]

Remove translated filtershow_strings.xml files.

commit | commitdiff | tree

Baligh Uddin [Sat, 5 Oct 2013 04:08:40 +0000 (04:08 +0000)]

Merge "Build broken." into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Mindy DelliCarpini [Sat, 5 Oct 2013 02:44:02 +0000 (19:44 -0700)]

Update camera assets for de-blue effort

Fixes b/11007065 Shutter button disappears / becomes white when pressed

Change-Id: I4001df821e545317eb4436da21f8f8d255d330f3

commit | commitdiff | tree

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

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 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: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: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: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: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: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: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

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: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