OSDN Git Service
Bobby Georgescu [Wed, 26 Sep 2012 18:26:08 +0000 (11:26 -0700)]
am
3fd76400: Fix display of clustering items in album set page
* commit '
3fd764008a73dd76be87b02f42d0e00786015c8a':
Fix 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
Wu-cheng Li [Wed, 26 Sep 2012 06:12:12 +0000 (23:12 -0700)]
am
9c3912a2: Remove icon attributon.
* commit '
9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269':
Remove icon attributon.
Wu-cheng Li [Wed, 26 Sep 2012 05:46:21 +0000 (13:46 +0800)]
Remove icon attributon.
bug:
6855540
Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9
Doris Liu [Tue, 25 Sep 2012 20:59:46 +0000 (13:59 -0700)]
am
e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches
* commit '
e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3':
Making switchState public
Doris Liu [Tue, 25 Sep 2012 20:58:36 +0000 (13:58 -0700)]
Merge "Making switchState public" into gb-ub-photos-arches
Bart Sears [Tue, 25 Sep 2012 20:56:22 +0000 (13:56 -0700)]
am
99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
* commit '
99420758f796b4d461c40033b886a0b464986902':
Revert "Update gallery launcher icons."
Bart Sears [Tue, 25 Sep 2012 20:54:22 +0000 (13:54 -0700)]
Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
Bobby Georgescu [Tue, 25 Sep 2012 20:00:49 +0000 (13:00 -0700)]
am
00ccf35f: Grid/filmstrip switching behavior improvements
* commit '
00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14':
Grid/filmstrip switching behavior improvements
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
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
Wu-cheng Li [Tue, 25 Sep 2012 10:20:04 +0000 (03:20 -0700)]
am
62e8403c: Add API check for "context" input port of effects recording.
* commit '
62e8403c69f4a82a4023651499a88f15eaa47fa5':
Add API check for "context" input port of effects recording.
Wu-cheng Li [Tue, 25 Sep 2012 10:00:51 +0000 (03:00 -0700)]
am
7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
* commit '
7c79f6cab19e60d887a42b03fb123bb0358141b5':
Add an unlock image in the end of secure album.
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
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
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
Pin Ting [Tue, 25 Sep 2012 08:41:21 +0000 (01:41 -0700)]
am
03f6fce6: Enable effects recording in JellyBean.
* commit '
03f6fce66de39b3578ac036557c1ec1aed729f61':
Enable 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
Wu-cheng Li [Tue, 25 Sep 2012 04:12:19 +0000 (21:12 -0700)]
am
5eff2242: Register secure image capture intent.
* commit '
5eff22421ad9bd7af8611e72d98c7ab71f842cb2':
Register 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
Michael Kolb [Tue, 25 Sep 2012 02:47:23 +0000 (19:47 -0700)]
am
f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches
* commit '
f6a5c701d3fa41b93e12768e2456e993960321e6':
Remove old camera activity from launcher
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
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
Bobby Georgescu [Mon, 24 Sep 2012 21:34:54 +0000 (14:34 -0700)]
am
e06c9f10: Restore missing "Group by" option in camera roll grid view
* commit '
e06c9f109f06813ca1f8a0abb549d51aefd4973d':
Restore 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
Bobby Georgescu [Mon, 24 Sep 2012 21:32:45 +0000 (14:32 -0700)]
am
3eb2e643: Fix occasional crash when restoring photo page state
* commit '
3eb2e643a40d1be77998373343cdf8b14764f58c':
Fix 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
Teng-Hui Zhu [Mon, 24 Sep 2012 20:44:09 +0000 (13:44 -0700)]
am
15ff1b1c: The trimming solution with the mp4parser library.
* commit '
15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2':
The 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
Mangesh Ghiware [Mon, 24 Sep 2012 15:48:18 +0000 (08:48 -0700)]
am
4f32d514: Use vendor specific MIME type for sharing LightCycle panoramas
* commit '
4f32d514ee7474d867d04bf3934f9e11e9e92783':
Use 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
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
Baligh Uddin [Fri, 21 Sep 2012 22:01:37 +0000 (15:01 -0700)]
am
2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2267ac9fe59393a11034e4bcfa37b919492006fa':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 21 Sep 2012 22:01:21 +0000 (15:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 21 Sep 2012 22:00:41 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Fri, 21 Sep 2012 21:54:10 +0000 (14:54 -0700)]
am
9b270f4f: Snap a photo to the center after fling ends in filmstrip
* commit '
9b270f4f2e20fb0f0455529c2e20990173a75470':
Snap a photo to the center after fling ends in filmstrip
Baligh Uddin [Fri, 21 Sep 2012 19:35:29 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c4a2425d7dc0ef6aa78d74abfe38c14eb263401
Auto-generated-cl: translation import
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
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
Wu-cheng Li [Fri, 21 Sep 2012 17:28:01 +0000 (10:28 -0700)]
am
23e595f0: Support secure image capture mode.
* commit '
23e595f0c656ebaeb63f78e3018b5830628c5afe':
Support secure image capture mode.
The Android Open Source Project [Fri, 21 Sep 2012 16:07:15 +0000 (09:07 -0700)]
am
766566ac: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
766566ac1c5560166b786a1018cd2360c43888a0':
Do not accept fling gesture after we changed from/to filmstrip mode.
Chih-Chung Chang [Fri, 21 Sep 2012 16:07:14 +0000 (09:07 -0700)]
am
2e3b5a9e: am
e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode.
* commit '
2e3b5a9e4c687e8eac85e12dcc77415847bdc039':
Do not accept fling gesture after we changed from/to filmstrip mode.
Jean-Baptiste Queru [Fri, 21 Sep 2012 16:07:13 +0000 (09:07 -0700)]
am
2f4c73d9: Merge from AOSP
* commit '
2f4c73d9995158522bd18db125232838afd099e8':
Fine-tune SDK versions
Progressbar: correct the first updated value for progressbar
The Android Open Source Project [Fri, 21 Sep 2012 16:07:12 +0000 (09:07 -0700)]
The Android Open Source Project [Fri, 21 Sep 2012 16:07:11 +0000 (09:07 -0700)]
Wu-cheng Li [Fri, 21 Sep 2012 06:36:21 +0000 (14:36 +0800)]
Support secure image capture mode.
bug:
7141738
Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25
Ed Heyl [Fri, 21 Sep 2012 04:33:44 +0000 (21:33 -0700)]
Merge remote-tracking branch 'goog/gb-ub-photos-arches' into jb-mr1-dev
Baligh Uddin [Thu, 20 Sep 2012 21:21:16 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7783e54826e36d2c5e7cbc0dcd4fd0bef829f20f
Auto-generated-cl: translation import
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
The Android Open Source Project [Thu, 20 Sep 2012 17:41:03 +0000 (10:41 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I08c7654bad53aad3a1b72c8a229973f889045902
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
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
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
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
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
Hung-ying Tyan [Thu, 20 Sep 2012 03:42:32 +0000 (20:42 -0700)]
Merge "Tests for 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
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
Bobby Georgescu [Wed, 19 Sep 2012 22:14:53 +0000 (15:14 -0700)]
Make ActionBar always present in filmstrip
Bug:
7196718
Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
Baligh Uddin [Wed, 19 Sep 2012 20:28:47 +0000 (13:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87c1664b1a905b42035da98f051feb0fcd001cc0
Auto-generated-cl: translation import
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
Ed Heyl [Wed, 19 Sep 2012 16:41:24 +0000 (09:41 -0700)]
reset jb-mr1-dev branch to photos-a branch
Earl Ou [Wed, 19 Sep 2012 03:59:45 +0000 (11:59 +0800)]
Tests for ExifData
Bug:
7192363
Change-Id: Ic74ecad2eff50e26efa85f928ef7904a2c51ecc7
Earl Ou [Thu, 30 Aug 2012 08:07:08 +0000 (16:07 +0800)]
Simplify the usage of ExifData
Bug:
7192363
Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
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
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
George Mount [Tue, 18 Sep 2012 05:13:00 +0000 (22:13 -0700)]
Add UriImage support for viewing LightCycle panoramas.
Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074
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
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
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
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
Bobby Georgescu [Mon, 17 Sep 2012 22:42:38 +0000 (15:42 -0700)]
Reskin: increase album icon size
Bug:
7050303
Change-Id: I29c804ec74c797f112950481ea2b606508950033
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
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
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
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
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
Baligh Uddin [Mon, 17 Sep 2012 21:11:19 +0000 (14:11 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
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
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
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
Bobby Georgescu [Mon, 17 Sep 2012 18:07:51 +0000 (11:07 -0700)]
Fix build breakage
Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501
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
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
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
Baligh Uddin [Fri, 14 Sep 2012 23:36:04 +0000 (16:36 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
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
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
Mangesh Ghiware [Fri, 14 Sep 2012 19:07:45 +0000 (12:07 -0700)]
Merge "Update AndroidManifest.xml" into gb-ub-photos-arches
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
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
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
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
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
Bobby Georgescu [Fri, 14 Sep 2012 05:32:37 +0000 (22:32 -0700)]
Only show FX button for photos
Bug:
7165294
Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd
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
Baligh Uddin [Fri, 14 Sep 2012 02:15:14 +0000 (19:15 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
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
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
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