OSDN Git Service
Bobby Georgescu [Thu, 4 Oct 2012 18:47:16 +0000 (11:47 -0700)]
am
b1a51397: Snap back photo after swipe in y-direction in filmstrip
* commit '
b1a513974d59c1dc14e004338b6795d6c3c5e5e8':
Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:15:43 +0000 (11:15 -0700)]
Snap back photo after swipe in y-direction in filmstrip
Bug:
7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
Pin Ting [Thu, 4 Oct 2012 13:55:46 +0000 (06:55 -0700)]
am
2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
* commit '
2abc1350cde24e810f6437592f099c149ce19ada':
Accelerate PNG image rendering.
Pin Ting [Thu, 4 Oct 2012 13:54:47 +0000 (06:54 -0700)]
Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
Pin Ting [Thu, 4 Oct 2012 08:54:50 +0000 (16:54 +0800)]
Accelerate PNG image rendering.
Bug:
7137662
Change-Id: I050a228a6c8031c6a2d068eb4ba1b39be86e9f4a
Owen Lin [Thu, 4 Oct 2012 08:46:47 +0000 (01:46 -0700)]
am
accef756: Fix NPE in ImageLoader.
* commit '
accef756f100d5c27a4d13d6a6bfa5c75714e5bc':
Fix NPE in ImageLoader.
Owen Lin [Thu, 4 Oct 2012 08:15:07 +0000 (16:15 +0800)]
Fix NPE in ImageLoader.
bug:
7275805
Change-Id: Ied04553a97efe5b4996418f20d834d6bd0893976
Owen Lin [Thu, 4 Oct 2012 07:42:28 +0000 (00:42 -0700)]
am
fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches
* commit '
fab36399a0fa455377854d65fab012ee6ee55868':
Set type as well while launching editor.
Owen Lin [Thu, 4 Oct 2012 07:41:13 +0000 (00:41 -0700)]
Merge "Set type as well while launching editor." into gb-ub-photos-arches
Baligh Uddin [Thu, 4 Oct 2012 04:55:54 +0000 (21:55 -0700)]
am
9778705a: (-s ours) Import translations. DO NOT MERGE
* commit '
9778705aa8ea34a9bff27f9d77ac46d35514278a':
Import translations. DO NOT MERGE
Owen Lin [Thu, 4 Oct 2012 03:26:30 +0000 (11:26 +0800)]
Set type as well while launching editor.
bug:
7275805
Change-Id: I6b86dd03d92b2cf453947bd84a0247e1626c81db
Baligh Uddin [Thu, 4 Oct 2012 00:22:02 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d9b7d0fe8d4d6a47ee4caec8567570bb2aa374d
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 00:21:38 +0000 (17:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I07074d563d0ab8ef237ca7f27fb15d2c768c310d
Auto-generated-cl: translation import
Mangesh Ghiware [Wed, 3 Oct 2012 23:00:13 +0000 (16:00 -0700)]
am
6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
* commit '
6090237f178914fa7d7eef514c2e2512d4c27847':
Revert "Add a overflow menu item to view 360-degree panorama."
Mangesh Ghiware [Wed, 3 Oct 2012 22:58:41 +0000 (15:58 -0700)]
Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
Mangesh Ghiware [Wed, 3 Oct 2012 22:48:54 +0000 (15:48 -0700)]
Revert "Add a overflow menu item to view 360-degree panorama."
This reverts commit
d84ae72adb147c0e8517a438b3dea3e87d319bb7
Change-Id: I5921cbb476034da2798480534e9084e287312f04
nicolasroard [Wed, 3 Oct 2012 21:45:41 +0000 (14:45 -0700)]
am
124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches
* commit '
124a9d3f2adc08fdef179e1922762d024d27fd69':
Fix ANR in image editor
nicolasroard [Wed, 3 Oct 2012 21:44:12 +0000 (14:44 -0700)]
Merge "Fix ANR in image editor" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 21:30:11 +0000 (14:30 -0700)]
Fix ANR in image editor
bug:
7275425
Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa
Bobby Georgescu [Wed, 3 Oct 2012 21:14:28 +0000 (14:14 -0700)]
am
56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
* commit '
56bc8b742d750f2fff9d3a30e6cc96e1850c782d':
Fix snapping behavior in filmstrip
Bobby Georgescu [Wed, 3 Oct 2012 21:13:10 +0000 (14:13 -0700)]
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 20:31:33 +0000 (13:31 -0700)]
Fix snapping behavior in filmstrip
Bug:
7277936
Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a
Mangesh Ghiware [Wed, 3 Oct 2012 20:10:46 +0000 (13:10 -0700)]
am
b57e72bb: Disable destructive rotate for lightcycle panorama
* commit '
b57e72bb1a093afc5aee276855656c8b285c73b3':
Disable destructive rotate for lightcycle panorama
Mangesh Ghiware [Wed, 3 Oct 2012 05:45:14 +0000 (22:45 -0700)]
Disable destructive rotate for lightcycle panorama
Bug:
7276024
Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9
Mangesh Ghiware [Wed, 3 Oct 2012 19:45:33 +0000 (12:45 -0700)]
am
d84ae72a: Add a overflow menu item to view 360-degree panorama.
* commit '
d84ae72adb147c0e8517a438b3dea3e87d319bb7':
Add a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 06:26:29 +0000 (23:26 -0700)]
Add a overflow menu item to view 360-degree panorama.
Bug:
7276026
Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4
George Mount [Wed, 3 Oct 2012 18:32:59 +0000 (11:32 -0700)]
am
217acd7c: Change LightCycle assets.
* commit '
217acd7c338871f426f4c975a8f9b889275cd321':
Change LightCycle assets.
George Mount [Wed, 3 Oct 2012 17:46:16 +0000 (10:46 -0700)]
Change LightCycle assets.
Bug
7279463
Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369
Baligh Uddin [Wed, 3 Oct 2012 15:29:09 +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
Baligh Uddin [Wed, 3 Oct 2012 15:27:58 +0000 (08:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 3 Oct 2012 15:27:25 +0000 (08:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 07:18:44 +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
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
Mangesh Ghiware [Wed, 3 Oct 2012 07:07:24 +0000 (00:07 -0700)]
am
847587b5: Remove redundant handling of share action.
* commit '
847587b51800d4b2d241cd1b7c8b589be2c24133':
Remove 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
John Hoford [Wed, 3 Oct 2012 02:28:57 +0000 (19:28 -0700)]
am
c7b2c287: Add Shadow feature
* commit '
c7b2c287bfbe3f53a4d65800c3884b0082ad683c':
Add Shadow feature
John Hoford [Wed, 3 Oct 2012 01:12:03 +0000 (18:12 -0700)]
Add Shadow feature
bug:
7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
nicolasroard [Wed, 3 Oct 2012 00:32:06 +0000 (17:32 -0700)]
am
45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches
* commit '
45e666c65b75d36327c3491fb8e1245ba5cf4c77':
Implements image sharing
nicolasroard [Wed, 3 Oct 2012 00:29:49 +0000 (17:29 -0700)]
Merge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Mon, 1 Oct 2012 07:25:11 +0000 (00:25 -0700)]
Implements image sharing
bug:
7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e
Bobby Georgescu [Wed, 3 Oct 2012 00:17:41 +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
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
Bobby Georgescu [Tue, 2 Oct 2012 22:53:02 +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
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
Teng-Hui Zhu [Tue, 2 Oct 2012 20:58:06 +0000 (13:58 -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
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
John Reck [Tue, 2 Oct 2012 20:51:53 +0000 (13:51 -0700)]
am
536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches
* commit '
536ff1512fae7c8ad6ee276bf102269011fb6e50':
Fix NFC regression
John Reck [Tue, 2 Oct 2012 20:51:03 +0000 (13:51 -0700)]
Merge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:38:22 +0000 (13:38 -0700)]
Fix NFC regression
Bug:
7263536
Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
Baligh Uddin [Tue, 2 Oct 2012 20:19:13 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58b8b0327577f4d64131ae2d9f63661283ef7c63
Auto-generated-cl: translation import
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
Bobby Georgescu [Tue, 2 Oct 2012 19:37:23 +0000 (12:37 -0700)]
am
6423defe: Fix crash, remove logging added to diagnose bug
* commit '
6423defee1d8ccf4d462d40ae4f82c7d73b11ab5':
Fix 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
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
Bobby Georgescu [Tue, 2 Oct 2012 17:43:13 +0000 (10:43 -0700)]
am
462923e5: Check item is editable before attempting to launch editor
* commit '
462923e5800e151ab5ec450063334ba430c1da3a':
Check 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
Owen Lin [Tue, 2 Oct 2012 09:10:02 +0000 (02:10 -0700)]
am
13360629: Remove ActionBarSherlock
* commit '
1336062985c9824d7fd796b1cebd5eaa8e4163ca':
Remove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock
bug:
7242682
Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
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.
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
George Mount [Tue, 2 Oct 2012 01:28:14 +0000 (18:28 -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"
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
Bobby Georgescu [Tue, 2 Oct 2012 01:19:59 +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
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
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
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
John Hoford [Tue, 2 Oct 2012 00:53:28 +0000 (17:53 -0700)]
am
3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
* commit '
3cf072213abc2e2b03f7c1a0069b37b2ca79f70c':
Fix exposure and fixed warnings
John Hoford [Tue, 2 Oct 2012 00:52:41 +0000 (17:52 -0700)]
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
John Hoford [Tue, 2 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Fix exposure and fixed warnings
bug:
7234321
Ruben Brunk [Tue, 2 Oct 2012 00:33:16 +0000 (17:33 -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.
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
George Mount [Tue, 2 Oct 2012 00:24:07 +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
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
Bobby Georgescu [Mon, 1 Oct 2012 23:56:40 +0000 (16:56 -0700)]
am
3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner"
* commit '
3cf502a91b36bf6ce633f897505b0a2c3fc53ad5':
Move 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
John Reck [Mon, 1 Oct 2012 22:35:52 +0000 (15:35 -0700)]
am
c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
* commit '
c58fe396fb7c6208740fa22a005e94a358b8266f':
Remove OnFrameAvailableListener in tear down
John Reck [Mon, 1 Oct 2012 22:34:52 +0000 (15:34 -0700)]
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
John Reck [Mon, 1 Oct 2012 22:26:10 +0000 (15:26 -0700)]
Remove OnFrameAvailableListener in tear down
Bug:
7217305
Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57
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
Baligh Uddin [Mon, 1 Oct 2012 21:54:10 +0000 (14:54 -0700)]
am
d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d87b77c46889e8d7b24c64e63b29cf7411445f03':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 21:53:07 +0000 (14:53 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 1 Oct 2012 21:52:41 +0000 (14:52 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
George Mount [Fri, 28 Sep 2012 19:55:22 +0000 (12:55 -0700)]
Enable swiping from LightCycle to Gallery
Bug
7212420
Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402
Bobby Georgescu [Mon, 1 Oct 2012 18:34:36 +0000 (11:34 -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
Baligh Uddin [Mon, 1 Oct 2012 18:22:52 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie907c6bfacb07ab244aa6265c12d6b210c8d581b
Auto-generated-cl: translation import
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
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
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
nicolasroard [Mon, 1 Oct 2012 07:00:08 +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
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
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
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
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
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
Bobby Georgescu [Sun, 30 Sep 2012 21:15:14 +0000 (14:15 -0700)]
Merge "Fix crash in album page" into gb-ub-photos-arches
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.
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
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
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.
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
OSDN Git Service
