OSDN Git Service

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

11 years agoSimplify the usage of ExifData
Earl Ou [Thu, 30 Aug 2012 08:07:08 +0000 (16:07 +0800)]
Simplify the usage of ExifData

Bug:7192363

Change-Id: I2c6ab9974f4472f63483a4de814728584944535e

11 years agoMerge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches
Pin Ting [Wed, 19 Sep 2012 08:28:18 +0000 (01:28 -0700)]
Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches

11 years agoUse 565 pixel format for pre-JB; use 888 otherwise.
Pin Ting [Wed, 19 Sep 2012 07:05:28 +0000 (15:05 +0800)]
Use 565 pixel format for pre-JB; use 888 otherwise.

Bug:7189512
Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e

11 years agoAdd UriImage support for viewing LightCycle panoramas.
George Mount [Tue, 18 Sep 2012 05:13:00 +0000 (22:13 -0700)]
Add UriImage support for viewing LightCycle panoramas.

Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074

11 years agoMerge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos...
Bobby Georgescu [Tue, 18 Sep 2012 17:21:21 +0000 (10:21 -0700)]
Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches

11 years agoFix incorrect texture size causing artifacts in animation
Bobby Georgescu [Tue, 18 Sep 2012 05:45:05 +0000 (22:45 -0700)]
Fix incorrect texture size causing artifacts in animation

Bug: 7181383
Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5

11 years agoDo not show edit button in secure album.
Wu-cheng Li [Tue, 18 Sep 2012 04:02:41 +0000 (12:02 +0800)]
Do not show edit button in secure album.

bug:7183052
Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2

11 years agoUse a different task affinity for secure camera.
Wu-cheng Li [Mon, 17 Sep 2012 09:32:59 +0000 (17:32 +0800)]
Use a different task affinity for secure camera.

This makes sure non-secure camera activity is not started in
secure lock screen. Also add excludeFromRecents for secure
camera.

bug:7148152
Change-Id: I18a10ccf95f22563aad59d5d936470af47596b91

11 years agoReskin: increase album icon size
Bobby Georgescu [Mon, 17 Sep 2012 22:42:38 +0000 (15:42 -0700)]
Reskin: increase album icon size

Bug: 7050303
Change-Id: I29c804ec74c797f112950481ea2b606508950033

11 years agoMerge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches
Bobby Georgescu [Mon, 17 Sep 2012 22:24:59 +0000 (15:24 -0700)]
Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches

11 years agoDon't switch back to fullscreen camera when flinging
Bobby Georgescu [Mon, 17 Sep 2012 21:30:46 +0000 (14:30 -0700)]
Don't switch back to fullscreen camera when flinging

Bug: 7145903
Bug: 7050303
It was very annoying to users to fling in the filmstrip
and end up in the fullscreen camera mode, so disabling
that. Long-term, we want to be smarter about this and
do the zoom to the full-screen if it's a short swipe
rather than a fling.

Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c

11 years agoFix bugs relating to grid/filmstrip switching
Bobby Georgescu [Mon, 17 Sep 2012 21:48:52 +0000 (14:48 -0700)]
Fix bugs relating to grid/filmstrip switching

Bug: 7180582
Bug: 7146147
Change-Id: I3d2ad8866a938f9f162e14f11bc2e021834ba513

11 years agoMerge "Reskin: do not show edit (FX) button in filmstrip mode" into gb-ub-photos...
Bobby Georgescu [Mon, 17 Sep 2012 21:26:39 +0000 (14:26 -0700)]
Merge "Reskin: do not show edit (FX) button in filmstrip mode" into gb-ub-photos-arches

11 years agoMerge "Reskin: update colors to match latest mocks" into gb-ub-photos-arches
Bobby Georgescu [Mon, 17 Sep 2012 21:26:08 +0000 (14:26 -0700)]
Merge "Reskin: update colors to match latest mocks" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 17 Sep 2012 21:11:19 +0000 (14:11 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoReskin: do not show edit (FX) button in filmstrip mode
Bobby Georgescu [Mon, 17 Sep 2012 21:02:59 +0000 (14:02 -0700)]
Reskin: do not show edit (FX) button in filmstrip mode

Bug: 7050303
Change-Id: Ibab686bc8581e8cc24a722950ff3b8b77023edd4

11 years agoReskin: update colors to match latest mocks
Bobby Georgescu [Mon, 17 Sep 2012 20:49:19 +0000 (13:49 -0700)]
Reskin: update colors to match latest mocks

Bug: 7050303
Change-Id: Ie582fe561d763a5010a0aea8b3a391237f5fbc1e

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 17 Sep 2012 18:26:02 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE

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

11 years agoFix build breakage
Bobby Georgescu [Mon, 17 Sep 2012 18:07:51 +0000 (11:07 -0700)]
Fix build breakage

Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501

11 years agoShow large button to open the camera when gallery is empty
Bobby Georgescu [Fri, 14 Sep 2012 20:54:54 +0000 (13:54 -0700)]
Show large button to open the camera when gallery is empty

Bug: 7156303
Change-Id: I0447c3eaee680e80f09cc3aff714aace85ee77d9

11 years agoFix manifest to launch correct activity
Michael Kolb [Mon, 17 Sep 2012 00:16:25 +0000 (17:16 -0700)]
Fix manifest to launch correct activity

  Bug: 7175368

Change task affinity to launch correct camera activity

Change-Id: I6bd22a8b64317a8e37f4c13ebf374465096662e7

11 years agoUpdate AndroidManifest for video caputure intent in the new camera
Doris Liu [Sat, 15 Sep 2012 01:43:41 +0000 (18:43 -0700)]
Update AndroidManifest for video caputure intent in the new camera

Bug: 7174617

Change-Id: Ib749615fbcb4bc8c882138d29ed234441ca4103e

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 14 Sep 2012 23:36:04 +0000 (16:36 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoAdd launcher icon for old camera UI
Mangesh Ghiware [Fri, 14 Sep 2012 19:40:03 +0000 (12:40 -0700)]
Add launcher icon for old camera UI

Needed for testing HAL

Change-Id: I528fe4564d1e2a2b9fe0e2a5be711da3c98a4a45

11 years agoHandle image capture intent using new camera UI.
Mangesh Ghiware [Fri, 14 Sep 2012 19:17:54 +0000 (12:17 -0700)]
Handle image capture intent using new camera UI.

Bug: 7166362
Change-Id: I253230342803c12d25025378ef80ba3ef96a1233

11 years agoMerge "Update AndroidManifest.xml" into gb-ub-photos-arches
Mangesh Ghiware [Fri, 14 Sep 2012 19:07:45 +0000 (12:07 -0700)]
Merge "Update AndroidManifest.xml" into gb-ub-photos-arches

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 14 Sep 2012 18:24:36 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE

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

11 years agoUpdate AndroidManifest.xml
Mangesh Ghiware [Fri, 14 Sep 2012 07:10:41 +0000 (00:10 -0700)]
Update AndroidManifest.xml

Handle launcher, camera, and video camera intents using new
CameraActivity.

Continue to handle image and video capture intents using old Camera and
VideoCamera activities.

Bug: 7167758
Change-Id: Idfddedf04c9664a368f745ebf3f5b44c3d584207

11 years agoMerge "Only show FX button for photos" into gb-ub-photos-arches
Bobby Georgescu [Fri, 14 Sep 2012 07:08:44 +0000 (00:08 -0700)]
Merge "Only show FX button for photos" into gb-ub-photos-arches

11 years agoMerge "Show animation when opening albums directly in filmstrip" into gb-ub-photos...
Bobby Georgescu [Fri, 14 Sep 2012 07:08:12 +0000 (00:08 -0700)]
Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches

11 years agoMerge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos...
Owen Lin [Fri, 14 Sep 2012 07:04:36 +0000 (00:04 -0700)]
Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches

11 years agoOnly show FX button for photos
Bobby Georgescu [Fri, 14 Sep 2012 05:32:37 +0000 (22:32 -0700)]
Only show FX button for photos

Bug: 7165294
Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd

11 years agoShow animation when opening albums directly in filmstrip
Bobby Georgescu [Fri, 14 Sep 2012 05:24:29 +0000 (22:24 -0700)]
Show animation when opening albums directly in filmstrip

Bug: 7166947
Change-Id: Id67e93431365043673e08b400aea5df9ae53f14c

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

11 years agoAnimate correctly when opening single-photo album
Bobby Georgescu [Thu, 13 Sep 2012 22:46:40 +0000 (15:46 -0700)]
Animate correctly when opening single-photo album

Bug: 7164177
Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Sep 2012 17:26:15 +0000 (10:26 -0700)]
Import translations. DO NOT MERGE

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

11 years agoCancel the loading task when clicking on back in Cropping.
Owen Lin [Thu, 13 Sep 2012 07:38:57 +0000 (15:38 +0800)]
Cancel the loading task when clicking on back in Cropping.

bug: 5636363
Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b

11 years agoWhen tapping single-photo albums, launch photo directly
Bobby Georgescu [Wed, 12 Sep 2012 23:37:53 +0000 (16:37 -0700)]
When tapping single-photo albums, launch photo directly

Bug: 7145102
Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207

11 years agoMerge "Make ndk-build happy for Gallery jni." into gb-ub-photos-arches
Teng-Hui Zhu [Wed, 12 Sep 2012 22:53:09 +0000 (15:53 -0700)]
Merge "Make ndk-build happy for Gallery jni." into gb-ub-photos-arches

11 years agoReskin: Fix stability bugs introduced by reskin
Bobby Georgescu [Wed, 12 Sep 2012 20:48:50 +0000 (13:48 -0700)]
Reskin: Fix stability bugs introduced by reskin

Bug: 7150348
Bug: 7144206
Bug: 7050303

If PhotoPage is launched/resumed on a completely empty
album (for instance, if Gallery was opened to the Camera
folder and paused, all photos were deleted via the Camera
app, and then Gallery is resumed), bail out of PhotoPage
since it cannot handle this. Also fixes an NPE.

Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a

11 years agoMerge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
Bobby Georgescu [Wed, 12 Sep 2012 07:14:01 +0000 (00:14 -0700)]
Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches

11 years agoLaunch next-gen editor if present and show FX button
Bobby Georgescu [Wed, 12 Sep 2012 00:02:03 +0000 (17:02 -0700)]
Launch next-gen editor if present and show FX button

Bug: 7050303
Shows editor button on the photo page and launches the
next-gen photo editor if it is present on the device.

Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea

11 years agoMake ndk-build happy for Gallery jni.
Teng-Hui Zhu [Tue, 11 Sep 2012 21:24:02 +0000 (14:24 -0700)]
Make ndk-build happy for Gallery jni.

Need to specify the APP_PLATFORM to support egl.h when running ndk-build locally.

Change-Id: Ic2bf1e8b8021816063a123f5c2398727ea4b0493

11 years agoReskin: fix bug introduce by Gallery reskin
Bobby Georgescu [Tue, 11 Sep 2012 20:47:27 +0000 (13:47 -0700)]
Reskin: fix bug introduce by Gallery reskin

Bug: 7146147
Bug: 7050303
Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a

11 years agoMerge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
Bobby Georgescu [Tue, 11 Sep 2012 19:37:45 +0000 (12:37 -0700)]
Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches

11 years agoReskin: stop at first photo after swipe from camera
Bobby Georgescu [Tue, 11 Sep 2012 18:18:36 +0000 (11:18 -0700)]
Reskin: stop at first photo after swipe from camera

Bug: 6399763
Bug: 7050303
Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c

11 years agoMerge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
George Mount [Tue, 11 Sep 2012 17:42:56 +0000 (10:42 -0700)]
Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches

11 years agoAdd the UI elements for video trim activity.
Teng-Hui Zhu [Fri, 24 Aug 2012 21:50:37 +0000 (14:50 -0700)]
Add the UI elements for video trim activity.

1. Refactored the classes to support both the video play and trim.

Now the common code for controller overlay is in CommonControllerOverlay,
which is basically the same as the original MovieControllerOverlay without
animation. Because in trimming, we don't want to hide all the controller.
The specific animations are implemented in the sub-classes which are
TrimControllerOverlay and MovieControllerOverlay.

At the same time, TrimTimeBar extended TimeBar to support the extra
trimming start scrubber and end scrubber.

The interface between the timebar and the controllerOverlay are kept almost
the same way, except adding the trimming info when necessary.

With all these, the activity of TrimVideo now relied on the TrimTimeBar
and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar
and MovieControllerOverlay.

2. Hook the TrimVideo activity with the trim menu.

Note that the icons are temporary for now, still need UX input on that.

bug:7093055

Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b

11 years agoSeparate build for AOSP and Google panorama modules.
George Mount [Mon, 10 Sep 2012 23:03:49 +0000 (16:03 -0700)]
Separate build for AOSP and Google panorama modules.

Change-Id: Icb1059569914711a704334282566d898f58d1a30

11 years agoDo not accept fling gesture after we changed from/to filmstrip mode.
Chih-Chung Chang [Thu, 6 Sep 2012 12:02:09 +0000 (20:02 +0800)]
Do not accept fling gesture after we changed from/to filmstrip mode.

Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905

11 years agoMerge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
Owen Lin [Tue, 11 Sep 2012 04:24:31 +0000 (21:24 -0700)]
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches

11 years agoEnsure peekObject is called in the syncrhonization block.
Owen Lin [Tue, 4 Sep 2012 08:53:42 +0000 (16:53 +0800)]
Ensure peekObject is called in the syncrhonization block.

bug: 7019598
Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f

11 years agoMerge "Remove the space before colons in details." into gb-ub-photos-arches
Owen Lin [Tue, 11 Sep 2012 04:10:18 +0000 (21:10 -0700)]
Merge "Remove the space before colons in details." into gb-ub-photos-arches

11 years agoAdd attribution of icons.
Wu-cheng Li [Mon, 10 Sep 2012 10:28:15 +0000 (18:28 +0800)]
Add attribution of icons.

Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e

11 years agoDon't start filmstrip mode in Get Content mode.
Owen Lin [Tue, 11 Sep 2012 03:47:52 +0000 (11:47 +0800)]
Don't start filmstrip mode in Get Content mode.

Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837
fix: 7135936

11 years agoMerge "Enable new camera UI" into gb-ub-photos-arches
Michael Kolb [Tue, 11 Sep 2012 01:57:46 +0000 (18:57 -0700)]
Merge "Enable new camera UI" into gb-ub-photos-arches

11 years agoMerge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
Bobby Georgescu [Mon, 10 Sep 2012 23:06:11 +0000 (16:06 -0700)]
Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches