OSDN Git Service

android-x86/packages-apps-Gallery2.git
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 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 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

11 years agoMerge "Trimming: switch to use selectors." into gb-ub-photos-arches
Teng-Hui Zhu [Wed, 26 Sep 2012 20:48:50 +0000 (13:48 -0700)]
Merge "Trimming: switch to use selectors." into gb-ub-photos-arches

11 years agoTrimming: switch to use selectors.
Teng-Hui Zhu [Mon, 24 Sep 2012 23:36:36 +0000 (16:36 -0700)]
Trimming: switch to use selectors.

Switch into using 2 selectors for the starting and end point of triming.
Shift the bar up a bit to accommandate the selectors.
bug:7093240

Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72

11 years agoAvoid unnecessary allocation
John Reck [Wed, 26 Sep 2012 18:37:23 +0000 (11:37 -0700)]
Avoid unnecessary allocation

 Bug: 7238418

Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310

11 years agoFixed behavior for back key when viewing download.
Ruben Brunk [Thu, 20 Sep 2012 18:16:46 +0000 (11:16 -0700)]
Fixed behavior for back key when viewing download.

Bug: 7205463
Bug: 7164238
Bug: 7175040

When viewing an image via the download notification from browser,
changed the default behavior of the back key to take the user to
the downloads folder.

Change-Id: Ia842bfa0f23c3b0ba767e3f0447add2c9b2cc6a7

11 years agoDon't set treat back as up if there is no parent album.
Owen Lin [Thu, 20 Sep 2012 04:22:54 +0000 (12:22 +0800)]
Don't set treat back as up if there is no parent album.

Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274
fix: 7180467

11 years agoFix display of clustering items in album set page
Bobby Georgescu [Wed, 26 Sep 2012 00:23:22 +0000 (17:23 -0700)]
Fix display of clustering items in album set page

Bug: 7217602
There was an incorrect assumption that onCreateActionBar
would always be called before onResume.

Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b

11 years agoShow unlock image in secure album only when camera roll has items.
Wu-cheng Li [Wed, 26 Sep 2012 10:20:11 +0000 (18:20 +0800)]
Show unlock image in secure album only when camera roll has items.

bug:7192331

Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e

11 years agoRemove icon attributon.
Wu-cheng Li [Wed, 26 Sep 2012 05:46:21 +0000 (13:46 +0800)]
Remove icon attributon.

bug:6855540
Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9

11 years agoMerge "Making switchState public" into gb-ub-photos-arches
Doris Liu [Tue, 25 Sep 2012 20:58:36 +0000 (13:58 -0700)]
Merge "Making switchState public" into gb-ub-photos-arches

11 years agoMerge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
Bart Sears [Tue, 25 Sep 2012 20:54:22 +0000 (13:54 -0700)]
Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches

11 years agoRevert "Update gallery launcher icons."
Bart Sears [Tue, 25 Sep 2012 19:57:56 +0000 (12:57 -0700)]
Revert "Update gallery launcher icons."

For now, go back to JB icons for Gallery

Bug: 6855540

This reverts commit 9bf98d94d59571d220f7e288f565f599422f9b82

Change-Id: I1659134d54f7baa8488b791b903d3da37ab01662

11 years agoGrid/filmstrip switching behavior improvements
Bobby Georgescu [Wed, 19 Sep 2012 23:51:05 +0000 (16:51 -0700)]
Grid/filmstrip switching behavior improvements

Bug: 7200453
Bug: 7196483
Bug: 7222179
Bug: 7224619

Changes:
- Launch camera in capture even if paused in grid/filmstrip
- Fixed behavior of filmstrip button after launching grid
  from camera
- Refresh bar timeouts after swiping a photo
- Partially swiping from camera to filmstrip without lifting
  finger and then swiping back no longer results in unwanted
  switch to filmstrip
- Removed hacky solution to switching to filmstrip mode

Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8

11 years agoAdd API check for "context" input port of effects recording.
Wu-cheng Li [Tue, 25 Sep 2012 09:45:03 +0000 (17:45 +0800)]
Add API check for "context" input port of effects recording.

bug:7106963
Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50

11 years agoMerge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
Wu-cheng Li [Tue, 25 Sep 2012 09:59:17 +0000 (02:59 -0700)]
Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches

11 years agoAdd an unlock image in the end of secure album.
Wu-cheng Li [Mon, 24 Sep 2012 10:32:59 +0000 (18:32 +0800)]
Add an unlock image in the end of secure album.

When camera is started from secure lock screen, put placeholder
"proto-photo" at the end of the camera roll. When it is clicked,
it takes the user to the lock screen.

bug:7192331

Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34

11 years agoEnable effects recording in JellyBean.
Pin Ting [Tue, 25 Sep 2012 07:20:36 +0000 (15:20 +0800)]
Enable effects recording in JellyBean.

Bug:7106963
Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b

11 years agoRegister secure image capture intent.
Wu-cheng Li [Tue, 25 Sep 2012 03:20:27 +0000 (11:20 +0800)]
Register secure image capture intent.

bug:7225688

Change-Id: I22f0ee81a921b3ec811444c7d554f2400e6a5485

11 years agoMerge "Remove old camera activity from launcher" into gb-ub-photos-arches
Michael Kolb [Tue, 25 Sep 2012 02:45:46 +0000 (19:45 -0700)]
Merge "Remove old camera activity from launcher" into gb-ub-photos-arches

11 years agoRemove old camera activity from launcher
Michael Kolb [Tue, 25 Sep 2012 02:42:34 +0000 (19:42 -0700)]
Remove old camera activity from launcher

  Bug: 7201108

The old activity can still be started via:

adb shell am start -n com.google.android.gallery3d/com.android.camera.Camera

Change-Id: I57094903375a1ab26c43b7f6870de073d58345fa

11 years agoRestore missing "Group by" option in camera roll grid view
Bobby Georgescu [Mon, 24 Sep 2012 19:20:30 +0000 (12:20 -0700)]
Restore missing "Group by" option in camera roll grid view

Bug: 7217410
Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88

11 years agoFix occasional crash when restoring photo page state
Bobby Georgescu [Mon, 24 Sep 2012 18:26:10 +0000 (11:26 -0700)]
Fix occasional crash when restoring photo page state

Bug: 7216012
If the saved state being used to restore the photo page
includes an out-of-bounds index, ignore it and reset the
index to 0.

Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0

11 years agoThe trimming solution with the mp4parser library.
Teng-Hui Zhu [Sun, 23 Sep 2012 22:02:56 +0000 (15:02 -0700)]
The trimming solution with the mp4parser library.

bug:7093055

Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff

11 years agoUse vendor specific MIME type for sharing LightCycle panoramas
Mangesh Ghiware [Mon, 24 Sep 2012 00:19:34 +0000 (17:19 -0700)]
Use vendor specific MIME type for sharing LightCycle panoramas

Bug: 7150324
Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719

11 years agoMaking switchState public
Doris Liu [Sat, 22 Sep 2012 05:44:42 +0000 (22:44 -0700)]
Making switchState public

Bug: 7208910

switchState was only accessible within package com.android.gallery3d.app . Now
changing it to public so that it can be called from camera. This is part 1 of 2
in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome.

Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 21 Sep 2012 22:00:41 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 21 Sep 2012 19:35:07 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE

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

11 years agoSnap a photo to the center after fling ends in filmstrip
Bobby Georgescu [Fri, 21 Sep 2012 18:04:47 +0000 (11:04 -0700)]
Snap a photo to the center after fling ends in filmstrip

Bug: 7050303
Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68

11 years agoSupport secure image capture mode.
Wu-cheng Li [Fri, 21 Sep 2012 06:36:21 +0000 (14:36 +0800)]
Support secure image capture mode.

bug:7141738

Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Sep 2012 21:20:51 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Remove CAN_USE_FLAG_SECURE constant." into gb-ub-photos-arches
Wu-cheng Li [Thu, 20 Sep 2012 09:46:43 +0000 (02:46 -0700)]
Merge "Remove CAN_USE_FLAG_SECURE constant." into gb-ub-photos-arches

11 years agoMerge "Hide grid view menu item in secure album." into gb-ub-photos-arches
Wu-cheng Li [Thu, 20 Sep 2012 09:46:26 +0000 (02:46 -0700)]
Merge "Hide grid view menu item in secure album." into gb-ub-photos-arches

11 years agoRemove CAN_USE_FLAG_SECURE constant.
Wu-cheng Li [Wed, 19 Sep 2012 07:42:47 +0000 (15:42 +0800)]
Remove CAN_USE_FLAG_SECURE constant.

bug:7191713

Change-Id: Ia439970d9b51316ccf003fa17453deed7a27cf2b

11 years agoHide grid view menu item in secure album.
Wu-cheng Li [Thu, 20 Sep 2012 09:12:46 +0000 (17:12 +0800)]
Hide grid view menu item in secure album.

bug:7200451
Change-Id: I23b6fbc48aac46e9b25b159416bc9f64a357d038

11 years agoFix metadata of cropped image for details display.
Earl Ou [Wed, 19 Sep 2012 11:46:29 +0000 (19:46 +0800)]
Fix metadata of cropped image for details display.

+ drop the old thumbnail of the cropped image
+ update DateTime tag in EXIF
+ add EXIF Software tag
+ display DATE_MODIFIED in details instead of DATE_TAKEN

Bug:7192433
Change-Id: I89dcb29dd3242f58fe96cd25398217e94f42fc97

11 years agoMerge "Tests for ExifData" into gb-ub-photos-arches
Hung-ying Tyan [Thu, 20 Sep 2012 03:42:32 +0000 (20:42 -0700)]
Merge "Tests for ExifData" into gb-ub-photos-arches

11 years agoMerge "Simplify the usage of ExifData" into gb-ub-photos-arches
Hung-ying Tyan [Thu, 20 Sep 2012 03:42:05 +0000 (20:42 -0700)]
Merge "Simplify the usage of ExifData" into gb-ub-photos-arches

11 years agoAdd bottom bar UI for photo page
Bobby Georgescu [Tue, 18 Sep 2012 01:12:11 +0000 (18:12 -0700)]
Add bottom bar UI for photo page

Bug: 7050303
Bug: 7170148
Pulled the handling of the display of the edit (FX) button
out into a separate file and put in the groundwork for
supporting multiple buttons within a container along the
bottom of the screen and managing their display as well as
animating them in and out. Also added a button for launching
the panorama viewer when appropriate

Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103

11 years agoMake ActionBar always present in filmstrip
Bobby Georgescu [Wed, 19 Sep 2012 22:14:53 +0000 (15:14 -0700)]
Make ActionBar always present in filmstrip

Bug: 7196718
Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 19 Sep 2012 20:28:23 +0000 (13:28 -0700)]
Import translations. DO NOT MERGE

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

11 years agoTests for ExifData
Earl Ou [Wed, 19 Sep 2012 03:59:45 +0000 (11:59 +0800)]
Tests for ExifData

Bug:7192363

Change-Id: Ic74ecad2eff50e26efa85f928ef7904a2c51ecc7