OSDN Git Service
Owen Lin [Wed, 2 May 2012 09:22:52 +0000 (17:22 +0800)]
Change thumbnail's position only when it is invisible.
bug:
6393694
Change-Id: I33f41c3c894b4c6d28e0832cfd4badbfca3a4f64
Eric Fischer [Tue, 1 May 2012 20:28:45 +0000 (13:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 1 May 2012 18:36:07 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17da847d9cf238a770caa867bd27ea227797d71f
Eric Fischer [Tue, 1 May 2012 17:28:09 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a1227b0df7f6744d13a263ea433ccadccc76be8
Yuli Huang [Mon, 30 Apr 2012 23:12:23 +0000 (07:12 +0800)]
Increase localization string limit.
bug:
6421026
Change-Id: I8a296c37287605680eaaeda5765257cf45d5fc8e
Eric Fischer [Mon, 30 Apr 2012 20:56:32 +0000 (13:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:06:21 +0000 (13:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Wei Huang [Mon, 30 Apr 2012 19:56:30 +0000 (12:56 -0700)]
Merge "Don't enter film mode automatically when moving from camera preview to picture." into jb-dev
Chih-Chung Chang [Mon, 30 Apr 2012 18:58:59 +0000 (02:58 +0800)]
Don't enter film mode automatically when moving from camera preview to picture.
Also don't follow the scaling touch once we decide to change film mode, this makes the animation smoother.
Change-Id: I45f97bd8c3cc90666370afeb1c18d21dfcc87c06
Eric Fischer [Mon, 30 Apr 2012 18:50:26 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c
Chih-Chung Chang [Mon, 30 Apr 2012 18:27:28 +0000 (11:27 -0700)]
Merge "Fix black screen when viewing Gmail image file attachment. Bug:
6415848" into jb-dev
Chih-Chung Chang [Mon, 30 Apr 2012 18:25:09 +0000 (02:25 +0800)]
Fix black screen when viewing Gmail image file attachment.
Bug:
6415848
Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
Eric Fischer [Mon, 30 Apr 2012 17:45:08 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660
Wu-cheng Li [Mon, 30 Apr 2012 15:49:17 +0000 (23:49 +0800)]
Fix crash when select all is pressed.
bug:
6411186
Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
Chih-Chung Chang [Mon, 30 Apr 2012 09:33:21 +0000 (17:33 +0800)]
Fix Back behavior in gallery grid and remove camera preview tile.
Bug:
6411801
Bug:
6411709
Change-Id: Iebd7db06d44d315ac67eb8c5133b86044fce30c4
Wu-cheng Li [Mon, 30 Apr 2012 10:44:31 +0000 (03:44 -0700)]
Merge "Expose delete button in action bar in portrait." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 10:36:22 +0000 (18:36 +0800)]
Do not show action bar on camera.
bug:
6411406
Change-Id: I4fbb95c9913046b4d5b1cfa4ede10490d156ed3f
Wu-cheng Li [Mon, 30 Apr 2012 09:57:11 +0000 (02:57 -0700)]
Merge "Use gallery icon for action bar app icon in camera." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 09:43:01 +0000 (17:43 +0800)]
Use gallery icon for action bar app icon in camera.
bug:
6410923
Change-Id: Ie5b7c5a6b852ed59b61ee0cc4e462dee991167b8
Chih-Chung Chang [Thu, 26 Apr 2012 02:10:49 +0000 (10:10 +0800)]
Support drawing in different orientation in Gallery.
Bug
6312994: Swipe UX: do not directly show the camera roll when camera starts
Bug
6313191: Swipe UX: Change swipe direction after the user rotated the device
Bug
6313192: Swiping UX: make Gallery display in rotated mode
Bug
6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation
Bug
6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly
Bug
6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly
Bug
6401075: Able to scroll through the gallery pics while capturing video.
Bug
6405087: Filmstrip does not change with orientation
Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
Pin Ting [Mon, 30 Apr 2012 08:14:22 +0000 (01:14 -0700)]
Merge "Remove unused code." into jb-dev
Wu-cheng Li [Mon, 30 Apr 2012 07:02:56 +0000 (15:02 +0800)]
Expose delete button in action bar in portrait.
bug:
6411759
Change-Id: I135edad5ab7d1194c774e7d5ee680cf3ba3206ad
Pin Ting [Mon, 30 Apr 2012 06:43:11 +0000 (14:43 +0800)]
Remove unused code.
Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d
Yuli Huang [Mon, 30 Apr 2012 04:31:21 +0000 (21:31 -0700)]
Merge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
Eric Fischer [Fri, 27 Apr 2012 17:38:35 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5f364684f5e0d05d5e8cbbef3d4b6bbc40229061
Yuli Huang [Wed, 25 Apr 2012 15:51:52 +0000 (23:51 +0800)]
Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
1. Save edited PWA photo in 'dowload', same as cropped images.
2. Fix Crop-image toast may show strings without i18n.
bug:
6168430
Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
Eric Fischer [Thu, 26 Apr 2012 18:22:49 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b49535f98a414ec3c7989099d09f37a70ff5e00
Wu-cheng Li [Thu, 26 Apr 2012 10:36:54 +0000 (18:36 +0800)]
Do not use card effect for camera screen nail.
bug:
6402571
Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57
Wu-cheng Li [Thu, 26 Apr 2012 08:21:56 +0000 (16:21 +0800)]
Make sure action bar is hidden when camera starts.
bug:
6402552
Change-Id: I2ec39e607a505490e431181eb40e259102b9a773
Wu-cheng Li [Tue, 24 Apr 2012 10:58:58 +0000 (18:58 +0800)]
Hide action bar when camera screen nail is displayed.
bug:
6363385
Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee
Eric Fischer [Wed, 25 Apr 2012 17:35:01 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I725031b6fd65e573b5852b98aace63bd8ebe15e8
Yuli Huang [Wed, 25 Apr 2012 09:05:16 +0000 (02:05 -0700)]
Merge "Increase blue layer alpha to make highlights more evident."
Chih-Chung Chang [Wed, 25 Apr 2012 09:03:00 +0000 (02:03 -0700)]
Merge "Remove scissor tests."
Ray Chen [Wed, 25 Apr 2012 06:58:50 +0000 (14:58 +0800)]
Fix
6376466 After deleting photo, the next one will be shown too dark
b:
6376466
Change-Id: I7328215c45995d6ae1813ed861da3ad826809461
Chih-Chung Chang [Wed, 25 Apr 2012 07:57:14 +0000 (15:57 +0800)]
Remove scissor tests.
Change-Id: I9f2c462a251e518ce5954dde0eb6e509734254c4
Yuli Huang [Wed, 25 Apr 2012 07:52:46 +0000 (15:52 +0800)]
Increase blue layer alpha to make highlights more evident.
bug:
6145331
Change-Id: I0d8848a3f66885509dcde315e3403be0bb248bd6
Owen Lin [Fri, 20 Apr 2012 10:42:22 +0000 (18:42 +0800)]
Fix NPE in Gallery.
This happens if user set type in an intent. But we get a different type from
content resolver.
Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88
fix:
6358473
Chih-Chung Chang [Wed, 25 Apr 2012 04:05:43 +0000 (21:05 -0700)]
Merge "Don't do capture animation if we don't have Camera ScreenNail."
Chih-Chung Chang [Wed, 25 Apr 2012 03:50:08 +0000 (11:50 +0800)]
Don't do capture animation if we don't have Camera ScreenNail.
Also make "Back" jump to first picture instead of the previous one.
Bug:
6388263
Change-Id: Idf78363cf3952bf66c6b0688e79d99c01956cd07
The Android Open Source Project [Tue, 24 Apr 2012 22:19:35 +0000 (15:19 -0700)]
am
082ea423: am
49826d43: Reconcile with ics-mr1-release
* commit '
082ea4230f5892379cb0eebfd87d1594e51987ec':
Patch 2 for MR1.
Patch for MR1.
Eric Fischer [Tue, 24 Apr 2012 17:59:08 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3
Chih-Chung Chang [Fri, 20 Apr 2012 12:06:19 +0000 (20:06 +0800)]
Add capture animation in Gallery.
Change-Id: Ibf95cc64f37a4518377e64124af6606c4f14cdaa
Wu-cheng Li [Tue, 24 Apr 2012 10:42:48 +0000 (03:42 -0700)]
Merge "Add a method to disable toggle status bar."
Wu-cheng Li [Tue, 24 Apr 2012 10:33:10 +0000 (18:33 +0800)]
Add a method to disable toggle status bar.
Camera does not show status bar in both landscape and
portrait.
bug:
6378178
Change-Id: I80cead9c0e2ef0256288aafead6bd1a96cc93d7b
Yuli Huang [Tue, 24 Apr 2012 09:50:48 +0000 (02:50 -0700)]
Merge "Add prominent highlights for touch feedback."
Angus Kong [Tue, 24 Apr 2012 08:49:21 +0000 (01:49 -0700)]
Merge "Add Raw2DTexture."
Angus Kong [Wed, 11 Apr 2012 10:49:15 +0000 (18:49 +0800)]
Add Raw2DTexture.
Raw2DTexture is a wrapper of GL 2D texture. It also support copy other
texture's content into this texture.
bug:
5988937
Change-Id: Ib4f6ff7ed2f6ea499517536366b511b7984a9b98
Yuli Huang [Tue, 24 Apr 2012 07:20:28 +0000 (15:20 +0800)]
Add prominent highlights for touch feedback.
Mimic the system UI to fade out highlights on touch releases.
bug:
6145331
bug:
5379176
Change-Id: I44c9245a926b2c5eb46b28d494c6393ba7f0c30c
The Android Open Source Project [Mon, 23 Apr 2012 21:42:28 +0000 (14:42 -0700)]
am
49826d43: Reconcile with ics-mr1-release
* commit '
49826d43d1911939ccb1ac1ee9755ba5057065f6':
Patch 2 for MR1.
Patch for MR1.
The Android Open Source Project [Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release
Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658
Ray Chen [Thu, 5 Apr 2012 09:25:43 +0000 (17:25 +0800)]
Fix
6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar.
b:
6046544
Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
Ray Chen [Mon, 23 Apr 2012 02:06:03 +0000 (19:06 -0700)]
Merge "Fix
6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:
6208468"
Ray Chen [Mon, 23 Apr 2012 02:05:55 +0000 (19:05 -0700)]
Merge "Fix
6046987 The header on the contextual action bar when multiple photos are selected is very janky b:
6046987"
Eric Fischer [Fri, 20 Apr 2012 18:05:00 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5aa8ee935dca1e7d44d6b59b43c52d3241ed9b0
Owen Lin [Fri, 20 Apr 2012 03:47:43 +0000 (20:47 -0700)]
Merge "Fix a UI bug in rendering a rotated image."
Ray Chen [Fri, 20 Apr 2012 02:58:20 +0000 (10:58 +0800)]
Fix
6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80
b:
6208468
Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on
RandomAccessFile's open syscall. The lock should be separated because they're independent and
getDataManager is very frequently used too.
Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f
Chih-Chung Chang [Wed, 21 Mar 2012 11:01:30 +0000 (19:01 +0800)]
Patch 2 for MR1.
Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
Chih-Chung Chang [Tue, 20 Mar 2012 12:56:49 +0000 (20:56 +0800)]
Patch for MR1.
Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
Eric Fischer [Thu, 19 Apr 2012 18:05:50 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00bdda6e887bda0b9248d1366a52350786fa7cbb
Chih-Chung Chang [Thu, 19 Apr 2012 13:25:24 +0000 (06:25 -0700)]
Merge "In filmstrip, show placeholders for pictures not loaded yet."
Chih-Chung Chang [Thu, 19 Apr 2012 12:14:11 +0000 (20:14 +0800)]
In filmstrip, show placeholders for pictures not loaded yet.
Change-Id: I037f1f054da4a3800045d5b89724341ac22272a5
Ray Chen [Thu, 19 Apr 2012 09:14:40 +0000 (17:14 +0800)]
Fix
6046987 The header on the contextual action bar when multiple photos are selected is very janky
b:
6046987
Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
Owen Lin [Thu, 19 Apr 2012 07:09:12 +0000 (15:09 +0800)]
Fix a UI bug in rendering a rotated image.
Change-Id: I14f9f74c5d810dfbb56151722c7f604522fea938
Chih-Chung Chang [Thu, 19 Apr 2012 06:53:35 +0000 (23:53 -0700)]
Merge "Allow filmstrip to scroll before the screennail is loaded."
Chih-Chung Chang [Thu, 19 Apr 2012 05:34:48 +0000 (13:34 +0800)]
Allow filmstrip to scroll before the screennail is loaded.
Change-Id: I9aa7405902c4bfb7e4946cfe4e1263314a958686
Eric Fischer [Wed, 18 Apr 2012 18:37:24 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1
Chih-Chung Chang [Wed, 18 Apr 2012 16:31:59 +0000 (09:31 -0700)]
Chih-Chung Chang [Wed, 18 Apr 2012 16:31:58 +0000 (09:31 -0700)]
Chih-Chung Chang [Wed, 18 Apr 2012 12:08:57 +0000 (20:08 +0800)]
Film strip should be accessible only when an image is its default state.
Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387
Chih-Chung Chang [Tue, 17 Apr 2012 12:35:14 +0000 (20:35 +0800)]
Add thumb pool the cache Bitmap used for thumbnails.
Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4
Wu-cheng Li [Wed, 18 Apr 2012 12:09:05 +0000 (05:09 -0700)]
Merge "Add page tap listener."
Wu-cheng Li [Wed, 18 Apr 2012 09:10:02 +0000 (17:10 +0800)]
Add page tap listener.
Camera needs this for touch focus and video snapshot.
bug:
6313318
Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79
Owen Lin [Wed, 18 Apr 2012 10:22:10 +0000 (03:22 -0700)]
Merge "Slower scrolling for fling in filmstrip mode."
Owen Lin [Tue, 17 Apr 2012 08:21:12 +0000 (16:21 +0800)]
Fix NPE in onContentDirty.
onContentDirty is suppose to be called in Main thread.
Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41
Owen Lin [Tue, 17 Apr 2012 07:38:36 +0000 (15:38 +0800)]
Fix NPE in SlotView.
This NPE is actually a concurrent issue. We shall lock renderring when we clean up
the slots' data. But it didn't, so it may access to null data.
Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d
fix:
6302487
fix:
6308873
Eric Fischer [Tue, 17 Apr 2012 18:29:10 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14
Yuli Huang [Tue, 17 Apr 2012 11:05:52 +0000 (19:05 +0800)]
Fix b/
6318340: window range isn't updated when data size changes.
bug:
6318340
Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e
Ray Chen [Mon, 16 Apr 2012 08:18:47 +0000 (16:18 +0800)]
Fix b/
6213053 Add Help entry point to Gallery (targeted for J release)
b:
6213053
Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
Owen Lin [Tue, 17 Apr 2012 07:45:45 +0000 (00:45 -0700)]
Merge "Fix a concurrent issue in reload()."
Chih-Chung Chang [Tue, 17 Apr 2012 04:56:08 +0000 (12:56 +0800)]
Slower scrolling for fling in filmstrip mode.
Also don't animate scale for the first image size.
Change-Id: I6a71c00e813bd203e9f454bc9a776eadec06fd78
Owen Lin [Tue, 17 Apr 2012 04:12:03 +0000 (12:12 +0800)]
Fix a concurrent issue in reload().
We need to hold the DataManager.LOCK when calling reload.
Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c
fix:
6315479
Chih-Chung Chang [Tue, 17 Apr 2012 03:19:54 +0000 (20:19 -0700)]
Chih-Chung Chang [Tue, 17 Apr 2012 03:19:53 +0000 (20:19 -0700)]
Chih-Chung Chang [Tue, 17 Apr 2012 03:19:52 +0000 (20:19 -0700)]
am
51f0fad1: (-s ours) am
da7c5fab: am
42c1892a: Patch 2 for MR1.
* commit '
51f0fad1840800a914cede46ea83447b81e61b8e':
Patch 2 for MR1.
Chih-Chung Chang [Tue, 17 Apr 2012 03:11:37 +0000 (20:11 -0700)]
am
85171a9b: (-s ours) am
0c425fbb: am
4745319b: Patch for MR1.
* commit '
85171a9bc1a1571e3256135893757b0c7a6ab4b7':
Patch for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:55:30 +0000 (15:55 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:55:29 +0000 (15:55 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:54:13 +0000 (15:54 -0700)]
am
da7c5fab: am
42c1892a: Patch 2 for MR1.
* commit '
da7c5fab68cb65d0535d230b9487bfaa5d6ded56':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:54:12 +0000 (15:54 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:08 +0000 (15:52 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:07 +0000 (15:52 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:01 +0000 (15:52 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:00 +0000 (15:52 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:51:55 +0000 (15:51 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:51:54 +0000 (15:51 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 08:29:13 +0000 (16:29 +0800)]
Define max height/width for each picture in filmstrip mode.
Change-Id: I844a32f95237724a60a64afe5f746798886dcc2c
Chih-Chung Chang [Mon, 16 Apr 2012 06:34:46 +0000 (14:34 +0800)]
Reduce padding between photos, from 96 pixels to 16 dp.
Change-Id: I62b0013da45b7d7495b34e9e4e1e791bac9c9c1f
Martijn Coenen [Fri, 13 Apr 2012 22:25:01 +0000 (15:25 -0700)]
Merge "Use new Beam push API."
Martijn Coenen [Fri, 13 Apr 2012 22:23:38 +0000 (15:23 -0700)]
Use new Beam push API.
Change-Id: I3e5a69832d1ac01759e37fbde2cf2c1926219445
Eric Fischer [Fri, 13 Apr 2012 18:04:20 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6
OSDN Git Service
