OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoMerge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub...
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

11 years agoRevert "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

11 years agoMerge "Fix ANR in image editor" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 21:44:12 +0000 (14:44 -0700)]
Merge "Fix ANR in image editor" into gb-ub-photos-arches

11 years agoFix ANR in image editor
nicolasroard [Wed, 3 Oct 2012 21:30:11 +0000 (14:30 -0700)]
Fix ANR in image editor

bug:7275425
Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa

11 years agoMerge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 21:13:10 +0000 (14:13 -0700)]
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

11 years agoFix snapping behavior in filmstrip
Bobby Georgescu [Wed, 3 Oct 2012 20:31:33 +0000 (13:31 -0700)]
Fix snapping behavior in filmstrip

Bug: 7277936
Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a

11 years agoDisable 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

11 years agoAdd 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

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 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 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 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 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 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 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 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 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 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:18:50 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

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 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 agoRemove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 agoMerge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
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

11 years agoAdd FilterShow and clean up native lib handling
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

11 years agoMerge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoTrimming: Use OnClickListener for saving
Teng-Hui Zhu [Fri, 28 Sep 2012 16:10:21 +0000 (09:10 -0700)]
Trimming: Use OnClickListener for saving

bug:7093055

Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f

11 years agoShow 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

11 years agoMerge "Update to sharing panorama" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 28 Sep 2012 06:48:44 +0000 (23:48 -0700)]
Merge "Update to sharing panorama" into gb-ub-photos-arches

11 years agoUpdate to sharing panorama
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

11 years agoMerge "Use an actionbar - move the "show original" button to the bottom left - move...
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

11 years agoUse an actionbar
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoFix 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

11 years agoWe 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

11 years agoOnly 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

11 years agoMerge "Fix Monkey NPE" into gb-ub-photos-arches
John Reck [Thu, 27 Sep 2012 23:04:56 +0000 (16:04 -0700)]
Merge "Fix Monkey NPE" into gb-ub-photos-arches

11 years agoRemove the pie slider, add a linear slider
nicolasroard [Thu, 27 Sep 2012 22:10:28 +0000 (15:10 -0700)]
Remove the pie slider, add a linear slider

bug:7247494

Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79

11 years agoFix Monkey NPE
John Reck [Thu, 27 Sep 2012 22:26:00 +0000 (15:26 -0700)]
Fix Monkey NPE

 Bug: 7243032

Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197

11 years agoMerge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
Teng-Hui Zhu [Thu, 27 Sep 2012 21:20:18 +0000 (14:20 -0700)]
Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches

11 years agoAdd the intent filter to start the new editor
nicolasroard [Thu, 27 Sep 2012 19:20:11 +0000 (12:20 -0700)]
Add the intent filter to start the new editor
Set Gallery to identify as needing a largeHeap

bug:7246621

Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94

11 years agoTrimming: 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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Thu, 27 Sep 2012 16:58:26 +0000 (09:58 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoMerge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
Teng-Hui Zhu [Thu, 27 Sep 2012 16:21:14 +0000 (09:21 -0700)]
Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches

11 years agoSeveral secure album changes.
Wu-cheng Li [Thu, 27 Sep 2012 06:01:39 +0000 (14:01 +0800)]
Several secure album changes.

- Make the lock screen photo be a standard portrait size photo
- In the filmstrip, have the first tap on the lock screen photo
  take the user directly to the unlock screen.
- Switch the asset to be a "locked" lock rather than an
  "unlocked" lock.

bug:7192331

Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a

11 years agoMerge "Don't set treat back as up if there is no parent album." into gb-ub-photos...
Owen Lin [Thu, 27 Sep 2012 05:33:55 +0000 (22:33 -0700)]
Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches

11 years agoMerge "Show unlock image in secure album only when camera roll has items." into gb...
Wu-cheng Li [Thu, 27 Sep 2012 04:09:25 +0000 (21:09 -0700)]
Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches

11 years agoMerge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
Wu-cheng Li [Thu, 27 Sep 2012 03:34:04 +0000 (20:34 -0700)]
Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches

11 years agoFix background replacement crash in camcorder.
Wu-cheng Li [Thu, 27 Sep 2012 02:49:46 +0000 (10:49 +0800)]
Fix background replacement crash in camcorder.

Add proguard flag to prevent methods from removing.

bug:7106963
Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028

11 years agoLoad the correct library...
nicolasroard [Thu, 27 Sep 2012 02:05:08 +0000 (19:05 -0700)]
Load the correct library...

bug:7165910
Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953

11 years agoFix the build
nicolasroard [Thu, 27 Sep 2012 00:50:19 +0000 (17:50 -0700)]
Fix the build

Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924

11 years agoTrimming: switch to use sherlock action bar
Teng-Hui Zhu [Wed, 26 Sep 2012 21:20:46 +0000 (14:20 -0700)]
Trimming: switch to use sherlock action bar

Show a "done" instead of the icon according to the UX team.
And we don't have API level dependency.

bug:7093240

Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49

11 years agoOnly create debugTag if necessary
John Reck [Wed, 26 Sep 2012 23:20:09 +0000 (16:20 -0700)]
Only create debugTag if necessary

 Bug: 7238418
 String concatenation isn't free

Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931

11 years agoDon't requery a constant
John Reck [Wed, 26 Sep 2012 23:13:02 +0000 (16:13 -0700)]
Don't requery a constant

 Bug: 7238418

Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b

11 years agoInitial import of the new image editor
nicolasroard [Tue, 25 Sep 2012 21:27:56 +0000 (14:27 -0700)]
Initial import of the new image editor

bug:7165910
Change-Id: I756d6594f5bddd233772c979410362ca22e232a3

11 years agoFix behavior of up button in Camera app
Bobby Georgescu [Wed, 26 Sep 2012 21:22:57 +0000 (14:22 -0700)]
Fix behavior of up button in Camera app

Bug: 7233448
- Up button now goes to gallery root when appropriate.

Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Sep 2012 21:43:56 +0000 (14:43 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Avoid unnecessary allocation" into gb-ub-photos-arches
John Reck [Wed, 26 Sep 2012 21:24:22 +0000 (14:24 -0700)]
Merge "Avoid unnecessary allocation" into gb-ub-photos-arches