OSDN Git Service
John Hoford [Mon, 8 Oct 2012 22:21:37 +0000 (15:21 -0700)]
am
1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
* commit '
1a291db030b2f3f7752026dd347ec34b82f8891e':
add redeye and improve shadow removal
John Hoford [Mon, 8 Oct 2012 21:21:57 +0000 (14:21 -0700)]
add redeye and improve shadow removal
bug:
7234321
Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
Ruben Brunk [Mon, 8 Oct 2012 21:26:07 +0000 (14:26 -0700)]
am
7bd60250: Added stub for applying geometry flip.
* commit '
7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd':
Added stub for applying geometry flip.
Ruben Brunk [Mon, 8 Oct 2012 20:48:46 +0000 (13:48 -0700)]
Added stub for applying geometry flip.
Bug:
7224232
Bug:
7218935
Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
Ruben Brunk [Mon, 8 Oct 2012 20:18:52 +0000 (13:18 -0700)]
am
8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
* commit '
8e7b50948261570ec1d75ba451236b971dc5dc0f':
Adding Crop, Rotate, Flip.
Ruben Brunk [Mon, 8 Oct 2012 20:17:18 +0000 (13:17 -0700)]
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
Baligh Uddin [Mon, 8 Oct 2012 19:54:18 +0000 (12:54 -0700)]
am
d199202e: (-s ours) Import translations. DO NOT MERGE
* commit '
d199202e267d14d8fe307ccae8521191e84d32a5':
Import translations. DO NOT MERGE
Ruben Brunk [Thu, 27 Sep 2012 19:38:08 +0000 (12:38 -0700)]
Adding Crop, Rotate, Flip.
Bug:
7224232
Bug:
7218935
Adding geometry manipulation UI features.
Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
Baligh Uddin [Mon, 8 Oct 2012 18:16:44 +0000 (11:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib81a301f1766134e238b4280a19ad9dfb4ea54e7
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Oct 2012 18:16:15 +0000 (11:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5f9734095da2a7369cfbd5eb49526d8a0a925466
Auto-generated-cl: translation import
Bobby Georgescu [Sun, 7 Oct 2012 19:16:58 +0000 (12:16 -0700)]
am
4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches
* commit '
4de36129b57e3a5308c109a407ea17b4fa103fe4':
Change display of 360 panorama button
George Mount [Sun, 7 Oct 2012 19:11:22 +0000 (12:11 -0700)]
am
87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
* commit '
87b226cd6777431be09d3c1fcb01453e386256b2':
Move LightCycle undo to settings area.
Bobby Georgescu [Sat, 6 Oct 2012 22:22:03 +0000 (15:22 -0700)]
Change display of 360 panorama button
Bug:
7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
George Mount [Sat, 6 Oct 2012 19:25:08 +0000 (12:25 -0700)]
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Fri, 5 Oct 2012 23:17:13 +0000 (16:17 -0700)]
Move LightCycle undo to settings area.
Bug
7294328
Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e
nicolasroard [Fri, 5 Oct 2012 23:22:28 +0000 (16:22 -0700)]
am
df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
* commit '
df479ddec29551216a9344e4bae925f60185210a':
Add scale factor / quality parameters in filters
nicolasroard [Fri, 5 Oct 2012 23:20:49 +0000 (16:20 -0700)]
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 23:14:17 +0000 (16:14 -0700)]
am
e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
e6b2212a98fcd175343d63d2772afe963dc6d64e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 23:13:01 +0000 (16:13 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Oct 2012 23:12:42 +0000 (16:12 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 22:55:56 +0000 (15:55 -0700)]
Add scale factor / quality parameters in filters
bug:
7248352
Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d
Baligh Uddin [Fri, 5 Oct 2012 22:23:36 +0000 (15:23 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Oct 2012 21:55:59 +0000 (14:55 -0700)]
am
d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d3fe19b8f25efb13508e5749f5ec8cc2c6100c8e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 21:54:25 +0000 (14:54 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 20:05:17 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If09261ed041f8b93162a0aefd00d0169f74ff959
Auto-generated-cl: translation import
Baligh Uddin [Fri, 5 Oct 2012 20:04:51 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7237801c7893cf45ae7eee0a8a93b11fd05da031
Auto-generated-cl: translation import
nicolasroard [Fri, 5 Oct 2012 19:31:48 +0000 (12:31 -0700)]
am
7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
* commit '
7ca5aedd8249a642e3755f3614fc0a43225b4b58':
New UI...
nicolasroard [Fri, 5 Oct 2012 10:48:34 +0000 (03:48 -0700)]
New UI...
bug:
7289525
bug:
7289361
Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
Baligh Uddin [Fri, 5 Oct 2012 18:47:58 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: If0b7a533e907297be6f63a690ee2552fed95bda4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 5 Oct 2012 18:47:35 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I293a482aa77faf942e10d6b896e49bb9f5d14c29
Auto-generated-cl: translation import
nicolasroard [Fri, 5 Oct 2012 00:53:57 +0000 (17:53 -0700)]
am
f47e790e: Add a reset item menu
* commit '
f47e790e3f3553f69abe054eec20bd7585118843':
Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:50:20 +0000 (17:50 -0700)]
Add a reset item menu
bug:
7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
nicolasroard [Fri, 5 Oct 2012 00:21:29 +0000 (17:21 -0700)]
am
5448bf80: Implement sharpen
* commit '
5448bf8095483574649afcc2add7f153670c7450':
Implement sharpen
nicolasroard [Wed, 3 Oct 2012 04:57:22 +0000 (21:57 -0700)]
Implement sharpen
bug:
7279964
bug:
7247494
bug:
7234321
- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI
Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
Baligh Uddin [Thu, 4 Oct 2012 22:52:42 +0000 (15:52 -0700)]
am
d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d21ad73e2c209d54dea4d924eaba18df8b9bfb12':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:50:54 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 4 Oct 2012 22:50:35 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 22:17:28 +0000 (15:17 -0700)]
am
9c6c01dd: Fix build. Missing dummy class for Gallery2.
* commit '
9c6c01ddd5b7fce725bf4b3cec317820b16963b8':
Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:04:23 +0000 (15:04 -0700)]
Fix build. Missing dummy class for Gallery2.
Bug
7259843
Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614
Baligh Uddin [Thu, 4 Oct 2012 18:41:21 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25b758732297cd86a8782bedaeb96bfbd4b46674
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 18:40:56 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22d72c397ef2202c44673b5c5cc1b602e45600d8
Auto-generated-cl: translation import
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
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:48:54 +0000 (15:48 -0700)]
Revert "Add a overflow menu item to view 360-degree panorama."
This reverts commit
d84ae72adb147c0e8517a438b3dea3e87d319bb7
Change-Id: I5921cbb476034da2798480534e9084e287312f04
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 [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
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
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 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
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
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 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
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 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:26:01 +0000 (13:26 -0700)]
am
0aaf8fb8: Update FX/pano button appearance, placement, animation
* commit '
0aaf8fb8b86cbf6353937c12f377ad524661c553':
Update 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
Bobby Georgescu [Sun, 30 Sep 2012 18:46:43 +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
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
John Hoford [Sat, 29 Sep 2012 00:18:00 +0000 (17:18 -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:26 +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
Baligh Uddin [Fri, 28 Sep 2012 16:31:28 +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:07 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4baef1ad1eebf6662df8cf39036011f84b5446d
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
Mangesh Ghiware [Fri, 28 Sep 2012 06:50:12 +0000 (23:50 -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:46:05 +0000 (21:46 -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:27 +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 03:59:28 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I852979bedb664fdc7ac3bcde8e0491269e0719f5
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
nicolasroard [Thu, 27 Sep 2012 23:20:20 +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
Teng-Hui Zhu [Thu, 27 Sep 2012 21:21:29 +0000 (14:21 -0700)]
am
65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
* commit '
65f1bad399eca7fe1e31808f2cb0ad3c9399901e':
Trimming: clean up the UI for trimming.
Teng-Hui Zhu [Wed, 26 Sep 2012 23:34:44 +0000 (16:34 -0700)]
Trimming: clean up the UI for trimming.
Get rid of the home button and use the done button only in the action bar.
Switch back to use system actionbar / activity.
Rename the ShortenExample.
bug:
7093240
Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
Baligh Uddin [Thu, 27 Sep 2012 17:00:39 +0000 (10:00 -0700)]
am
8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
8f6dc9eab9feca563b08400a7ebd74fb5d0e3075':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Sep 2012 16:58:26 +0000 (09:58 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Teng-Hui Zhu [Thu, 27 Sep 2012 16:23:04 +0000 (09:23 -0700)]
am
27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
* commit '
27e933b00279c177ae0d36b599aa1c90870922c1':
Trimming: switch to use sherlock action bar