OSDN Git Service
Eric Fischer [Fri, 27 Apr 2012 17:38:35 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5f364684f5e0d05d5e8cbbef3d4b6bbc40229061
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
Owen Lin [Fri, 13 Apr 2012 04:33:29 +0000 (12:33 +0800)]
Fix ANR in PhotoPage.
This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event).
However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the
PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may
still waiting in the queue and never got a chance to run.
Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476
fix:
6319833
Yuli Huang [Thu, 12 Apr 2012 15:45:49 +0000 (23:45 +0800)]
Fix SinglePhotoDataAdapter getScreenNail()
bug:
6322259
Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
Yuli Huang [Tue, 10 Apr 2012 15:36:01 +0000 (08:36 -0700)]
Merge "Save edited photo in the source photo directory if applicable."
Chih-Chung Chang [Tue, 10 Apr 2012 11:51:16 +0000 (04:51 -0700)]
Merge "Add new filmstrip mode for PhotoView."
Chih-Chung Chang [Tue, 3 Apr 2012 04:21:16 +0000 (12:21 +0800)]
Add new filmstrip mode for PhotoView.
Change-Id: I9da9896303ced8d63a3557d5e6e9bc06fb366cf5
Yuli Huang [Tue, 10 Apr 2012 10:51:36 +0000 (18:51 +0800)]
Save edited photo in the source photo directory if applicable.
bug:
6168430
Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
Owen Lin [Mon, 9 Apr 2012 02:15:35 +0000 (10:15 +0800)]
Add BytesBufferPool to prevent GC.
Change-Id: Ia8513ff380a60f102481cbf25650eca149b75064
Owen Lin [Mon, 9 Apr 2012 08:11:30 +0000 (16:11 +0800)]
Prevent album's label get flashing when content changed.
Change-Id: I1b00b308af740ccab143a073643729ca880770f4
Owen Lin [Fri, 6 Apr 2012 08:46:32 +0000 (16:46 +0800)]
Refactor. Rename AlbumView to AlbumSlotRenderer.
Change-Id: I7d8d3586a910dac35975e4effa0d02528e2ccf98
Owen Lin [Thu, 5 Apr 2012 04:45:54 +0000 (12:45 +0800)]
Draw less to improve performance.
Also adjust the upload order to upload nearby textures first.
Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
Owen Lin [Fri, 6 Apr 2012 08:48:17 +0000 (01:48 -0700)]
Merge "Fix flashing in "Make available offline"."
Eric Fischer [Thu, 5 Apr 2012 19:26:25 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1
Owen Lin [Wed, 4 Apr 2012 04:22:59 +0000 (12:22 +0800)]
Fix flashing in "Make available offline".
Change-Id: I84f0896c6038eb21d32e0d5fe0cafec5d339e6ec
Owen Lin [Wed, 4 Apr 2012 02:24:08 +0000 (10:24 +0800)]
Refactor. Merge SelectionDrawer with SlotRenderer.
Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643
Owen Lin [Thu, 29 Mar 2012 06:27:58 +0000 (14:27 +0800)]
Upload textures in background.
Change-Id: I365f7be9aaab793366884249cbb10e8b6f0ab0e6
Owen Lin [Thu, 5 Apr 2012 07:11:05 +0000 (00:11 -0700)]
Merge "Make all drawing happens in background."
Owen Lin [Mon, 26 Mar 2012 10:28:48 +0000 (18:28 +0800)]
Make all drawing happens in background.
Also move more rendering code to SlotRenderers (AlbumSetView and AlbumView).
Change-Id: I1d678711bfd3655a48bb4b99d8ca175e088bdffb
Owen Lin [Thu, 5 Apr 2012 04:02:01 +0000 (12:02 +0800)]
Fix NPE in Gallery.
bug:
6249248
Change-Id: I41851c6524163195f6296a15893d962e706b3449
Martijn Coenen [Tue, 27 Mar 2012 01:25:50 +0000 (18:25 -0700)]
Support for beaming a picture.
Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
Mike Lockwood [Tue, 3 Apr 2012 17:52:23 +0000 (10:52 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
Wu-cheng Li [Tue, 3 Apr 2012 11:08:35 +0000 (19:08 +0800)]
Fix OOM when switching between camera and camcorder.
- Camera activities extend AbstractGalleryActivity. So
onDestroy is moved from Gallery to AbstractGalleryActivity.
- Use WeakReference for values in the WeakHashMap of
SpinnerVisibilitySetter.
bug:
5954389
Change-Id: Ib15f269bd4c54a4621bdff58e7ea16b44f8fb3e3
Ray Chen [Tue, 3 Apr 2012 02:42:55 +0000 (10:42 +0800)]
Fix b/
3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up
Change startActivity to switchState because not every MediaObject implements "getContentUri" which may
cause runtime exception.
Change-Id: I88be6e9e8f15ad17f4c7347b6dfc200c7682ce01
Ray Chen [Tue, 3 Apr 2012 09:24:21 +0000 (02:24 -0700)]
Merge "Fix b/
6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps"
Yuli Huang [Tue, 3 Apr 2012 09:02:29 +0000 (02:02 -0700)]
Merge "Fix b/
5974240: Sliders may not be responsive to touches."
Yuli Huang [Mon, 2 Apr 2012 13:40:25 +0000 (21:40 +0800)]
Fix b/
5974240: Sliders may not be responsive to touches.
Add padding around sliders to increase its touchable areas.
Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
OSDN Git Service
