OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 217acd7c: Change LightCycle assets.
George Mount [Wed, 3 Oct 2012 18:33:01 +0000 (11:33 -0700)]
am 217acd7c: Change LightCycle assets.

* commit '217acd7c338871f426f4c975a8f9b889275cd321':
  Change LightCycle assets.

11 years agoChange LightCycle assets.
George Mount [Wed, 3 Oct 2012 17:46:16 +0000 (10:46 -0700)]
Change LightCycle assets.

 Bug 7279463

Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369

11 years agoam e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Oct 2012 15:29:06 +0000 (08:29 -0700)]
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 3 Oct 2012 15:28:43 +0000 (08:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 3 Oct 2012 15:27:25 +0000 (08:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 07:18:49 +0000 (00:18 -0700)]
am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage

* commit 'f4e22eb44bfae0c2a3b6570f19480c8c3535d808':
  Correct behavior when swiping to placeholder item in PhotoPage

11 years agoCorrect behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 01:34:08 +0000 (18:34 -0700)]
Correct behavior when swiping to placeholder item in PhotoPage

Bug: 7261641
Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772

11 years agoam 847587b5: Remove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 07:07:30 +0000 (00:07 -0700)]
am 847587b5: Remove redundant handling of share action.

* commit '847587b51800d4b2d241cd1b7c8b589be2c24133':
  Remove redundant handling of share action.

11 years agoRemove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 06:50:53 +0000 (23:50 -0700)]
Remove redundant handling of share action.

Bug: 7256214

Gallery PhotoPage was handling the menu item selection for the share
action, in addition to the ShareActionProvider. Removing this leftover
code from pre-ActionBar implementation.

Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922

11 years agoam c7b2c287: Add Shadow feature
John Hoford [Wed, 3 Oct 2012 02:28:57 +0000 (19:28 -0700)]
am c7b2c287: Add Shadow feature

* commit 'c7b2c287bfbe3f53a4d65800c3884b0082ad683c':
  Add Shadow feature

11 years agoAdd Shadow feature
John Hoford [Wed, 3 Oct 2012 01:12:03 +0000 (18:12 -0700)]
Add Shadow feature

bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297

11 years agoam 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:31:12 +0000 (17:31 -0700)]
am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches

* commit '45e666c65b75d36327c3491fb8e1245ba5cf4c77':
  Implements image sharing

11 years agoMerge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:29:49 +0000 (17:29 -0700)]
Merge "Implements image sharing" into gb-ub-photos-arches

11 years agoImplements image sharing
nicolasroard [Mon, 1 Oct 2012 07:25:11 +0000 (00:25 -0700)]
Implements image sharing

bug:7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e

11 years agoam 9481d05b: Do not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Wed, 3 Oct 2012 00:17:51 +0000 (17:17 -0700)]
am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode

* commit '9481d05b0782dccd495c66d2e3240cd7448bbd4a':
  Do not show grid/filmstrip spinner in secure camera mode

11 years agoDo not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Tue, 2 Oct 2012 23:28:20 +0000 (16:28 -0700)]
Do not show grid/filmstrip spinner in secure camera mode

Bug: 7274284
Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123

11 years agoam 45f089d6: Show Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 22:53:15 +0000 (15:53 -0700)]
am 45f089d6: Show Camera placeholder as first filmstrip item in roll

* commit '45f089d69141e3fb0dfaad9bc34d275b61eb2aee':
  Show Camera placeholder as first filmstrip item in roll

11 years agoShow Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 20:30:09 +0000 (13:30 -0700)]
Show Camera placeholder as first filmstrip item in roll

Bug: 7272674
The camera roll filmstrip view now shows a shortcut to
launch the camera when opened from the Gallery app.
Note: the edits to SnailAlbum and SnailSource were made to
allow sharing code between SingleItemAlbum and SnailAlbum

Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0

11 years agoam 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub...
Teng-Hui Zhu [Tue, 2 Oct 2012 20:57:22 +0000 (13:57 -0700)]
am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

* commit '51915a622bbd32e90f0cd43b69a7851e13825737':
  Trimming: Exit current activity after click done

11 years agoMerge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
Teng-Hui Zhu [Tue, 2 Oct 2012 20:56:24 +0000 (13:56 -0700)]
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

11 years agoam 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:52:12 +0000 (13:52 -0700)]
am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches

* commit '536ff1512fae7c8ad6ee276bf102269011fb6e50':
  Fix NFC regression

11 years agoMerge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:51:03 +0000 (13:51 -0700)]
Merge "Fix NFC regression" into gb-ub-photos-arches

11 years agoFix NFC regression
John Reck [Tue, 2 Oct 2012 20:38:22 +0000 (13:38 -0700)]
Fix NFC regression

 Bug: 7263536

Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:19:59 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:18:50 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 6423defe: Fix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 19:37:44 +0000 (12:37 -0700)]
am 6423defe: Fix crash, remove logging added to diagnose bug

* commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5':
  Fix crash, remove logging added to diagnose bug

11 years agoFix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 18:41:25 +0000 (11:41 -0700)]
Fix crash, remove logging added to diagnose bug

Bug: 7216012
LocalMergeAlbum index was not being initialized
in constructor so it was possible to access the
index before it was populated with information.

Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c

11 years agoTrimming: Exit current activity after click done
Teng-Hui Zhu [Tue, 2 Oct 2012 18:21:37 +0000 (11:21 -0700)]
Trimming: Exit current activity after click done

Don't auto exit the trimmed video playing.
bug:7093055

Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8

11 years agoam 462923e5: Check item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:42:39 +0000 (10:42 -0700)]
am 462923e5: Check item is editable before attempting to launch editor

* commit '462923e5800e151ab5ec450063334ba430c1da3a':
  Check item is editable before attempting to launch editor

11 years agoCheck item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:30:07 +0000 (10:30 -0700)]
Check item is editable before attempting to launch editor

Bug: 7269840
Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057

11 years agoam 13360629: Remove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 09:10:02 +0000 (02:10 -0700)]
am 13360629: Remove ActionBarSherlock

* commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca':
  Remove ActionBarSherlock

11 years agoRemove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb

11 years agoam 935b9cfe: Merge "Update assets of the lock screen image in the secure album."...
Wu-cheng Li [Tue, 2 Oct 2012 06:32:00 +0000 (23:32 -0700)]
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

* commit '935b9cfe991c3afe119720c487dc24cc02c55584':
  Update assets of the lock screen image in the secure album.

11 years agoMerge "Update assets of the lock screen image in the secure album." into gb-ub-photos...
Wu-cheng Li [Tue, 2 Oct 2012 04:51:52 +0000 (21:51 -0700)]
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

11 years agoam 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub...
George Mount [Tue, 2 Oct 2012 01:27:59 +0000 (18:27 -0700)]
am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

* commit '2fc053edc38bf5070d980b541aa267b7a3325a8c':
  Revert "Enable swiping from LightCycle to Gallery"

11 years agoMerge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
George Mount [Tue, 2 Oct 2012 01:26:38 +0000 (18:26 -0700)]
Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

11 years agoam 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub...
Bobby Georgescu [Tue, 2 Oct 2012 01:19:40 +0000 (18:19 -0700)]
am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

* commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d':
  Improve display of ActionBar album mode switcher

11 years agoMerge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
Bobby Georgescu [Tue, 2 Oct 2012 01:18:45 +0000 (18:18 -0700)]
Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

11 years agoImprove display of ActionBar album mode switcher
Bobby Georgescu [Tue, 2 Oct 2012 00:49:30 +0000 (17:49 -0700)]
Improve display of ActionBar album mode switcher

Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
  latest UX mocks, making more room for title

Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940

11 years agoRevert "Enable swiping from LightCycle to Gallery"
George Mount [Tue, 2 Oct 2012 01:15:45 +0000 (18:15 -0700)]
Revert "Enable swiping from LightCycle to Gallery"

This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b
Changed mechanism for enabling swipe in LightCycle.

Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d

11 years agoam 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
John Hoford [Tue, 2 Oct 2012 00:54:06 +0000 (17:54 -0700)]
am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

* commit '3cf072213abc2e2b03f7c1a0069b37b2ca79f70c':
  Fix exposure and fixed warnings

11 years agoMerge "Fix exposure and fixed warnings" into gb-ub-photos-arches
John Hoford [Tue, 2 Oct 2012 00:52:41 +0000 (17:52 -0700)]
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

11 years agoFix exposure and fixed warnings
John Hoford [Tue, 2 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Fix exposure and fixed warnings

bug:7234321

11 years agoam 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into...
Ruben Brunk [Tue, 2 Oct 2012 00:32:55 +0000 (17:32 -0700)]
am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

* commit '83f50a9b3f3ba9ada8dc6999ed997499fd78c052':
  Fix for exceptions when image has no orientation data.

11 years agoMerge "Fix for exceptions when image has no orientation data." into gb-ub-photos...
Ruben Brunk [Tue, 2 Oct 2012 00:31:17 +0000 (17:31 -0700)]
Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

11 years agoam 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos...
George Mount [Tue, 2 Oct 2012 00:24:44 +0000 (17:24 -0700)]
am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

* commit '526c306051b0b92bcd54923a52a4c5bccaef7d77':
  Enable swiping from LightCycle to Gallery

11 years agoMerge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
George Mount [Tue, 2 Oct 2012 00:22:23 +0000 (17:22 -0700)]
Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

11 years agoam 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"
Bobby Georgescu [Mon, 1 Oct 2012 23:57:23 +0000 (16:57 -0700)]
am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"

* commit '3cf502a91b36bf6ce633f897505b0a2c3fc53ad5':
  Move grid/filmstrip switching to ActionBar title "spinner"

11 years agoMove grid/filmstrip switching to ActionBar title "spinner"
Bobby Georgescu [Mon, 1 Oct 2012 22:50:11 +0000 (15:50 -0700)]
Move grid/filmstrip switching to ActionBar title "spinner"

Bug: 7233818
Bug: 7240846
Bug: 7258973

Tapping the title of the album, whether in filmstrip or
grid mode, allows switching between these modes using a
menu. The album name is now displayed when viewing pictures
in the filmstrip or zoomed in modes. Finally, no longer
allow switching to grid mode when not appropriate.

Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0

11 years agoam c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos...
John Reck [Mon, 1 Oct 2012 22:35:42 +0000 (15:35 -0700)]
am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

* commit 'c58fe396fb7c6208740fa22a005e94a358b8266f':
  Remove OnFrameAvailableListener in tear down

11 years agoMerge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
John Reck [Mon, 1 Oct 2012 22:34:52 +0000 (15:34 -0700)]
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

11 years agoRemove OnFrameAvailableListener in tear down
John Reck [Mon, 1 Oct 2012 22:26:10 +0000 (15:26 -0700)]
Remove OnFrameAvailableListener in tear down

 Bug: 7217305

Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57

11 years agoFix for exceptions when image has no orientation data.
Ruben Brunk [Mon, 1 Oct 2012 22:08:23 +0000 (15:08 -0700)]
Fix for exceptions when image has no orientation data.

Bug: 7219163

When image has no orientation data, getOrientation now
catches the SQLiteException.

Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984

11 years agoam d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 1 Oct 2012 21:53:51 +0000 (14:53 -0700)]
am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 1 Oct 2012 21:52:41 +0000 (14:52 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoEnable swiping from LightCycle to Gallery
George Mount [Fri, 28 Sep 2012 19:55:22 +0000 (12:55 -0700)]
Enable swiping from LightCycle to Gallery

 Bug 7212420

Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402

11 years agoam d87c8624: More logs for gallery crash error, remove a potential cause
Bobby Georgescu [Mon, 1 Oct 2012 18:35:11 +0000 (11:35 -0700)]
am d87c8624: More logs for gallery crash error, remove a potential cause

* commit 'd87c8624a7ae477a6dea86d63866ade04f8d7e7c':
  More logs for gallery crash error, remove a potential cause

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:24:15 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:22:22 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMore logs for gallery crash error, remove a potential cause
Bobby Georgescu [Sun, 30 Sep 2012 21:09:30 +0000 (14:09 -0700)]
More logs for gallery crash error, remove a potential cause

Bug: 7216012
Made sure that FilterDeleteSet doesn't ever return stale
item counts, added extra logging in LocalMergeAlbum for
NoSuchElementException so that we can have more info to
diagnose this crash if it happens in the future.

Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03

11 years agoUpdate assets of the lock screen image in the secure album.
Wu-cheng Li [Mon, 1 Oct 2012 15:49:07 +0000 (23:49 +0800)]
Update assets of the lock screen image in the secure album.

bug:7192331
Change-Id: I551e14420e43106e97b093884571eaea27b00425

11 years agoam f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayo...
nicolasroard [Mon, 1 Oct 2012 07:00:46 +0000 (00:00 -0700)]
am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches

* commit 'f497fdfa1abfea7b4ddabd7850eb528ea1c126ee':
  Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now

11 years agoMerge "Fix border bug and filter application - fix layout (use framelayout) - fix...
nicolasroard [Mon, 1 Oct 2012 06:58:36 +0000 (23:58 -0700)]
Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches

11 years agoam 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub...
Teng-Hui Zhu [Sun, 30 Sep 2012 21:35:31 +0000 (14:35 -0700)]
am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches

* commit '1cd0fd2822ecc60adb09c90c27194ea8019ab59c':
  Trimming: support more box by keeping more classes

11 years agoMerge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches
Teng-Hui Zhu [Sun, 30 Sep 2012 21:33:27 +0000 (14:33 -0700)]
Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches

11 years agoTrimming: support more box by keeping more classes
Teng-Hui Zhu [Sun, 30 Sep 2012 21:27:24 +0000 (14:27 -0700)]
Trimming: support more box by keeping more classes

bug:7093055

Change-Id: Ie4dbae8270cf0072dfc74b5c91fec628f4cad673

11 years agoam 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches
Bobby Georgescu [Sun, 30 Sep 2012 21:15:52 +0000 (14:15 -0700)]
am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches

* commit '21421a10bc2ad9151d3d3075ad77d96610c2043f':
  Fix crash in album page

11 years agoMerge "Fix crash in album page" into gb-ub-photos-arches
Bobby Georgescu [Sun, 30 Sep 2012 21:15:14 +0000 (14:15 -0700)]
Merge "Fix crash in album page" into gb-ub-photos-arches

11 years agoam 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming...
Teng-Hui Zhu [Sun, 30 Sep 2012 20:54:34 +0000 (13:54 -0700)]
am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches

* commit '5168509fe260a9d549278a9a287c3d7e0c1b739e':
  Trimming: clean up strings and prevent too short or no trimming.

11 years agoMerge "Trimming: clean up strings and prevent too short or no trimming." into gb...
Teng-Hui Zhu [Sun, 30 Sep 2012 20:53:29 +0000 (13:53 -0700)]
Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches

11 years agoFix crash in album page
Bobby Georgescu [Sun, 30 Sep 2012 20:41:11 +0000 (13:41 -0700)]
Fix crash in album page

Bug: 7258955
Avoid second call to onPause when finishing
ActivityState instance within onPause.

Change-Id: I6081a6467e109a6edf35e60d24193e550cb0dd21

11 years agoam 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama...
Mangesh Ghiware [Sun, 30 Sep 2012 20:26:02 +0000 (13:26 -0700)]
am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches

* commit '3e2e9e9c7ee62b79632243a3e52f0abd70ce2a59':
  Remove video play icon and tap to play behavior for panorama.

11 years agoam 0aaf8fb8: Update FX/pano button appearance, placement, animation
Bobby Georgescu [Sun, 30 Sep 2012 20:26:01 +0000 (13:26 -0700)]
am 0aaf8fb8: Update FX/pano button appearance, placement, animation

* commit '0aaf8fb8b86cbf6353937c12f377ad524661c553':
  Update FX/pano button appearance, placement, animation

11 years agoMerge "Remove video play icon and tap to play behavior for panorama." into gb-ub...
Mangesh Ghiware [Sun, 30 Sep 2012 20:25:29 +0000 (13:25 -0700)]
Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches

11 years agoUpdate FX/pano button appearance, placement, animation
Bobby Georgescu [Sun, 30 Sep 2012 19:57:45 +0000 (12:57 -0700)]
Update FX/pano button appearance, placement, animation

Bug: 7213162
Bug: 7233446
Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e

11 years agoRemove video play icon and tap to play behavior for panorama.
Mangesh Ghiware [Sun, 30 Sep 2012 19:58:56 +0000 (12:58 -0700)]
Remove video play icon and tap to play behavior for panorama.

Bug: 7258968

Per new UX design, there'll be a panorama viewer icon in the bottom
right instead (see b/7233446)

This is essentially a revert of Change-Id
I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3

Change-Id: Ib35c99cca4ee9b2422dd16f5ea3b931ad5f08f35

11 years agoam 207b73ba: Add new gallery assets
Bobby Georgescu [Sun, 30 Sep 2012 18:46:57 +0000 (11:46 -0700)]
am 207b73ba: Add new gallery assets

* commit '207b73bafea60a79fde5e3323e87441762e4b6ed':
  Add new gallery assets

11 years agoAdd new gallery assets
Bobby Georgescu [Sun, 30 Sep 2012 18:35:41 +0000 (11:35 -0700)]
Add new gallery assets

Bug: 7258964
Change-Id: I02600bff90de1f665d6a5958d3235346cbfdaa01

11 years agoam f6b2ec81: Disable effects recording UI.
Wu-cheng Li [Sun, 30 Sep 2012 18:21:16 +0000 (11:21 -0700)]
am f6b2ec81: Disable effects recording UI.

* commit 'f6b2ec819e28d126f4ccb73d90e899e6fbed969e':
  Disable effects recording UI.

11 years agoDisable effects recording UI.
Wu-cheng Li [Sun, 30 Sep 2012 15:13:00 +0000 (23:13 +0800)]
Disable effects recording UI.

bug:7106963
Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87

11 years agoFix border bug and filter application
nicolasroard [Sat, 29 Sep 2012 07:17:09 +0000 (00:17 -0700)]
Fix border bug and filter application
- fix layout (use framelayout)
- fix copy imagepreset
- added a current image state panel
- remove title for border images for now

bug:7256090
bug:7249672
bug:7234317
bug:7225150

Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec

11 years agoTrimming: clean up strings and prevent too short or no trimming.
Teng-Hui Zhu [Sat, 29 Sep 2012 20:32:01 +0000 (13:32 -0700)]
Trimming: clean up strings and prevent too short or no trimming.

Also view the result if the activity is not stopped.
bug:7093055

Change-Id: If244d567a4be9da22542398f6b7c22a081786339

11 years agoam 0c3203f1: Remove the individual Curves channel filters Reorder the filters
nicolasroard [Sat, 29 Sep 2012 01:41:03 +0000 (18:41 -0700)]
am 0c3203f1: Remove the individual Curves channel filters Reorder the filters

* commit '0c3203f1789df3f8bd772dfd655e73b44636b629':
  Remove the individual Curves channel filters Reorder the filters

11 years agoRemove the individual Curves channel filters
nicolasroard [Sat, 29 Sep 2012 01:26:53 +0000 (18:26 -0700)]
Remove the individual Curves channel filters
Reorder the filters

bug:7234317
Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4

11 years agoMerge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
Dianne Hackborn [Sat, 29 Sep 2012 01:17:28 +0000 (18:17 -0700)]
Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev

11 years agoFix issue #7255954: API Review: rename Dream to DreamService
Dianne Hackborn [Sat, 29 Sep 2012 00:46:45 +0000 (17:46 -0700)]
Fix issue #7255954: API Review: rename Dream to DreamService

Change-Id: Ie24be85e3bb1d59c266d3fc83d035d162a643252

11 years agoam d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized...
John Hoford [Sat, 29 Sep 2012 00:17:59 +0000 (17:17 -0700)]
am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure

* commit 'd42f6c69c5980110c16cd679f914c4e4e7caa29d':
  Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure

11 years agoAdd contrast & brightness filters
John Hoford [Thu, 27 Sep 2012 23:34:21 +0000 (16:34 -0700)]
Add contrast & brightness filters
Added hue fixed contrast
Stablized Contrast, Saturation, Tint, Exposure

bug:7234321
Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee

11 years agoam 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with...
nicolasroard [Fri, 28 Sep 2012 23:17:27 +0000 (16:17 -0700)]
am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark

* commit '786fe6476e4ccf4b98489ff69d8ef439533cdc2a':
  Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark

11 years agoImprove ActionBar
nicolasroard [Fri, 28 Sep 2012 23:03:21 +0000 (16:03 -0700)]
Improve ActionBar
- show both undo and redo
- add the checkmark with done instead of the up mark

bug:7233986

Change-Id: I32af8068b08763461b720054f270cb6acabefbbf

11 years agoam d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into...
Bobby Georgescu [Fri, 28 Sep 2012 22:51:00 +0000 (15:51 -0700)]
am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches

* commit 'd5480bd5a849517106f232326fd2d31b80b72b3f':
  Debounce after quick fling towards camera but zoom if slow

11 years agoMerge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos...
Bobby Georgescu [Fri, 28 Sep 2012 22:49:27 +0000 (15:49 -0700)]
Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches

11 years agoDebounce after quick fling towards camera but zoom if slow
Bobby Georgescu [Fri, 28 Sep 2012 06:55:44 +0000 (23:55 -0700)]
Debounce after quick fling towards camera but zoom if slow

Bug: 7250026
Bug: 7213802
Change-Id: I3c900813937161744a36015469c70112f2cf356b

11 years agoam f98aafb7: Fix NPE in GalleryActionBar
Mangesh Ghiware [Fri, 28 Sep 2012 21:03:58 +0000 (14:03 -0700)]
am f98aafb7: Fix NPE in GalleryActionBar

* commit 'f98aafb7eb65b889b0f831d607828ca4f8af64b6':
  Fix NPE in GalleryActionBar

11 years agoFix NPE in GalleryActionBar
Mangesh Ghiware [Fri, 28 Sep 2012 20:48:13 +0000 (13:48 -0700)]
Fix NPE in GalleryActionBar

Bug: 7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0

11 years agoam 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photo...
Bart Sears [Fri, 28 Sep 2012 19:46:33 +0000 (12:46 -0700)]
am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches

* commit '5e91df3d56be743664c1a4a760f1668ec1de17dd':
  Add FilterShow and clean up native lib handling

11 years agoMerge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
Bart Sears [Fri, 28 Sep 2012 19:45:02 +0000 (12:45 -0700)]
Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches

11 years agoam 7caab0dc: Change the slider values range to -100 -> 100
nicolasroard [Fri, 28 Sep 2012 18:56:08 +0000 (11:56 -0700)]
am 7caab0dc: Change the slider values range to -100 -> 100

* commit '7caab0dc36f69b4c51c39bd191f2df44ea586b70':
  Change the slider values range to -100 -> 100

11 years agoChange the slider values range to -100 -> 100
nicolasroard [Fri, 28 Sep 2012 18:46:33 +0000 (11:46 -0700)]
Change the slider values range to -100 -> 100

bug:7247494
Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0

11 years agoam 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub...
Ruben Brunk [Fri, 28 Sep 2012 18:30:56 +0000 (11:30 -0700)]
am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches

* commit '75a93c78cd2a09eff08c16c6fee2bf683f483027':
  Fixed behavior for back key when viewing download.