OSDN Git Service
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
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: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"
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: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
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: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
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: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.
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: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
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: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"
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: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
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: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
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: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
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
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: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
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
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
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
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
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
Bobby Georgescu [Sun, 30 Sep 2012 18:35:41 +0000 (11:35 -0700)]
Add new gallery assets
Bug:
7258964
Change-Id: I02600bff90de1f665d6a5958d3235346cbfdaa01
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.
Wu-cheng Li [Sun, 30 Sep 2012 15:13:00 +0000 (23:13 +0800)]
Disable effects recording UI.
bug:
7106963
Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Mangesh Ghiware [Fri, 28 Sep 2012 20:48:13 +0000 (13:48 -0700)]
Fix NPE in GalleryActionBar
Bug:
7252666
Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
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
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
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
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
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.
Ruben Brunk [Fri, 28 Sep 2012 18:28:33 +0000 (11:28 -0700)]
Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
Bart Sears [Fri, 28 Sep 2012 17:40:05 +0000 (10:40 -0700)]
Add FilterShow and clean up native lib handling
Bug:
7165910
Add libjni_filtershow_filters to Gallery2 so users can edit photos
Bug:
7250099
Remove native libs from the apk in /system/apps
Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
Teng-Hui Zhu [Fri, 28 Sep 2012 17:14:19 +0000 (10:14 -0700)]
am
3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
* commit '
3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f':
Trimming: Use OnClickListener for saving
Teng-Hui Zhu [Fri, 28 Sep 2012 17:12:43 +0000 (10:12 -0700)]
Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
Baligh Uddin [Fri, 28 Sep 2012 16:31:49 +0000 (09:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 28 Sep 2012 16:31:38 +0000 (09:31 -0700)]
am
f8706c89: (-s ours) Import translations. DO NOT MERGE
* commit '
f8706c89cb45b45426f6bad8c593191595b043a2':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 16:29:59 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I504a35d1c058c82e0598b0ac6bfcb79ecfbc70f8
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 16:28:41 +0000 (09:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14dfb266d984cb34719216018aecae3d07e79e9f
Auto-generated-cl: translation import
Teng-Hui Zhu [Fri, 28 Sep 2012 16:10:21 +0000 (09:10 -0700)]
Trimming: Use OnClickListener for saving
bug:
7093055
Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
Bobby Georgescu [Fri, 28 Sep 2012 07:47:07 +0000 (00:47 -0700)]
am
c7e3c76d: Show a placeholder when the camera filmstrip is empty
* commit '
c7e3c76d6965f520a9651d309052c5f01726cd58':
Show a placeholder when the camera filmstrip is empty
Bobby Georgescu [Thu, 27 Sep 2012 23:36:03 +0000 (16:36 -0700)]
Show a placeholder when the camera filmstrip is empty
Bug:
7213757
Tapping the placeholder takes the user back to the
full-screen camera capture mode.
Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
Mangesh Ghiware [Fri, 28 Sep 2012 06:49:42 +0000 (23:49 -0700)]
am
2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches
* commit '
2e8472f304737acc3fbeb167b1b6f660f111f5c7':
Update to sharing panorama
Mangesh Ghiware [Fri, 28 Sep 2012 06:48:44 +0000 (23:48 -0700)]
Merge "Update to sharing panorama" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 28 Sep 2012 04:05:41 +0000 (21:05 -0700)]
Update to sharing panorama
Bug:
7150324
Use separate share intents for sharing panoarma and regular JPGs.
If photo is a 360 panorama, promote sharing it on the action bar,
and move sharing as JPG to overflow menu.
MIME type changed to specify panorama360.
Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
nicolasroard [Fri, 28 Sep 2012 04:45:54 +0000 (21:45 -0700)]
am
5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
* commit '
5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6':
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
nicolasroard [Fri, 28 Sep 2012 04:43:57 +0000 (21:43 -0700)]
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
nicolasroard [Fri, 28 Sep 2012 03:54:48 +0000 (20:54 -0700)]
Use an actionbar
- move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.
bug:
7234317
bug:
7233975
bug:
7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
Baligh Uddin [Fri, 28 Sep 2012 04:11:26 +0000 (21:11 -0700)]
am
8473d944: (-s ours) Import translations. DO NOT MERGE
* commit '
8473d94491059a07e9969de14751d5d3fd929061':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 28 Sep 2012 04:00:18 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0129ab582567ff7cb3d4202d5a489fe0e09e3b86
Auto-generated-cl: translation import
Baligh Uddin [Fri, 28 Sep 2012 03:59:05 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7669fd2cd14f553106779c0a60e60400d6c9f196
Auto-generated-cl: translation import
Bobby Georgescu [Fri, 28 Sep 2012 03:48:09 +0000 (20:48 -0700)]
am
624ed9df: Fix up button behavior in camera app
* commit '
624ed9df710ac4e34f3ff1d0c3bf4acd1c056258':
Fix up button behavior in camera app
Bobby Georgescu [Fri, 28 Sep 2012 01:10:06 +0000 (18:10 -0700)]
Fix up button behavior in camera app
Bug:
7233448
Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
nicolasroard [Thu, 27 Sep 2012 23:30:51 +0000 (16:30 -0700)]
am
863b4e65: We weren\'t applying the parameter on an existing filter
* commit '
863b4e65d172a19111f46e43f97e7e41927a3bc7':
We weren't applying the parameter on an existing filter
nicolasroard [Thu, 27 Sep 2012 23:25:12 +0000 (16:25 -0700)]
We weren't applying the parameter on an existing filter
bug:
7247494
Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
nicolasroard [Thu, 27 Sep 2012 23:20:26 +0000 (16:20 -0700)]
am
9579b815: Only apply the parameter to the currently edited filter
* commit '
9579b81504c16ac77aa7442767fbabe6abcfe24b':
Only apply the parameter to the currently edited filter
nicolasroard [Thu, 27 Sep 2012 23:05:23 +0000 (16:05 -0700)]
Only apply the parameter to the currently edited filter
bug:
7247494
Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
John Reck [Thu, 27 Sep 2012 23:06:13 +0000 (16:06 -0700)]
am
98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches
* commit '
98d17b863a5c8dc194496422459e73d7d38a2b9e':
Fix Monkey NPE
John Reck [Thu, 27 Sep 2012 23:04:56 +0000 (16:04 -0700)]
Merge "Fix Monkey NPE" into gb-ub-photos-arches
OSDN Git Service
