OSDN Git Service
nicolasroard [Fri, 5 Oct 2012 19:36:47 +0000 (12:36 -0700)]
am
2d1ae48f: am
57bc6d71: am
3c336202: am
7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
* commit '
2d1ae48fe6630fe4e1a94c1e6601199f2ed1b5b4':
New UI...
nicolasroard [Fri, 5 Oct 2012 19:35:31 +0000 (12:35 -0700)]
am
57bc6d71: am
3c336202: am
7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
* commit '
57bc6d71e83c78cc3ca804a4cb7863ba454e7042':
New UI...
nicolasroard [Fri, 5 Oct 2012 19:33:38 +0000 (12:33 -0700)]
am
3c336202: am
7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
* commit '
3c336202bb1f9afec7d16ae6877f6d49c92a6f2a':
New UI...
nicolasroard [Fri, 5 Oct 2012 19:31:43 +0000 (12:31 -0700)]
am
7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
* commit '
7ca5aedd8249a642e3755f3614fc0a43225b4b58':
New UI...
nicolasroard [Fri, 5 Oct 2012 19:30:24 +0000 (12:30 -0700)]
Merge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 10:48:34 +0000 (03:48 -0700)]
New UI...
bug:
7289525
bug:
7289361
Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
The Android Open Source Project [Fri, 5 Oct 2012 15:20:36 +0000 (08:20 -0700)]
am
9dfdd288: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9dfdd288e8528f453a2abad9e2982bb2c326fe47':
Upscale images to fill screen for slideshow
Snap back photo after swipe in y-direction in filmstrip
The Android Open Source Project [Fri, 5 Oct 2012 15:17:42 +0000 (08:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I912fa9388d69152f0b15a06ec8cea548e47684e0
The Android Automerger [Fri, 5 Oct 2012 14:00:04 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Owen Lin [Fri, 5 Oct 2012 03:55:52 +0000 (20:55 -0700)]
am
45816067: am
d6120d06: am
a556c058: am
e29fc4a5: Upload screennails in tiles to prevent jank
* commit '
458160670418167f645a7451b79b18b2a8646319':
Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:53:47 +0000 (20:53 -0700)]
am
d6120d06: am
a556c058: am
e29fc4a5: Upload screennails in tiles to prevent jank
* commit '
d6120d06df5e9e9931568e2f1336047c03d9a918':
Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:51:47 +0000 (20:51 -0700)]
am
a556c058: am
e29fc4a5: Upload screennails in tiles to prevent jank
* commit '
a556c0581fcb4323146df5e1f7c28bbf35a0e8e5':
Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:50:08 +0000 (20:50 -0700)]
am
e29fc4a5: Upload screennails in tiles to prevent jank
* commit '
e29fc4a51b99f12f7fae13fae272858df2e1af36':
Upload screennails in tiles to prevent jank
Owen Lin [Mon, 24 Sep 2012 03:20:34 +0000 (11:20 +0800)]
Upload screennails in tiles to prevent jank
bug:
6399444
Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b
Hung-ying Tyan [Fri, 5 Oct 2012 03:34:24 +0000 (20:34 -0700)]
am
03ca9914: am
996ec48f: am
002e90bf: am
9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
* commit '
03ca99145af298e430e83ba6b9d07d91f53f48bd':
Open album in filmstrip only if the item exists.
Hung-ying Tyan [Fri, 5 Oct 2012 02:39:08 +0000 (19:39 -0700)]
am
996ec48f: am
002e90bf: am
9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
* commit '
996ec48f6f87a34c2be256ab27cdbcc1fbd94281':
Open album in filmstrip only if the item exists.
Hung-ying Tyan [Fri, 5 Oct 2012 02:37:30 +0000 (19:37 -0700)]
am
002e90bf: am
9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
* commit '
002e90bf111c3eb5847f92e4d3ede899dfc8ba0f':
Open album in filmstrip only if the item exists.
Hung-ying Tyan [Fri, 5 Oct 2012 02:35:27 +0000 (19:35 -0700)]
am
9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
* commit '
9bcba5b049f199ad78051c2ad27897cad389679d':
Open album in filmstrip only if the item exists.
Hung-ying Tyan [Fri, 5 Oct 2012 02:33:35 +0000 (19:33 -0700)]
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 00:59:24 +0000 (17:59 -0700)]
am
b3b0f8f6: am
f038d2d2: am
ca3c75ff: am
f47e790e: Add a reset item menu
* commit '
b3b0f8f61eae322a844d6184e0e59a85562148dd':
Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:57:47 +0000 (17:57 -0700)]
am
f038d2d2: am
ca3c75ff: am
f47e790e: Add a reset item menu
* commit '
f038d2d2556a79fe8988f06cac0ad9e402527bef':
Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:55:45 +0000 (17:55 -0700)]
am
ca3c75ff: am
f47e790e: Add a reset item menu
* commit '
ca3c75ffbf1863a3e4bd827f74a61cc7657d6679':
Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:53:52 +0000 (17:53 -0700)]
am
f47e790e: Add a reset item menu
* commit '
f47e790e3f3553f69abe054eec20bd7585118843':
Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:50:20 +0000 (17:50 -0700)]
Add a reset item menu
bug:
7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
John Hoford [Fri, 5 Oct 2012 00:41:42 +0000 (17:41 -0700)]
am
5e7eff7d: am
e8a105c4: am
02b24ed2: am
b559b2dd: add vibrance fix a free in shadows
* commit '
5e7eff7d9c1a1fd4098cfbee26262df5c90b48e9':
add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:39:09 +0000 (17:39 -0700)]
am
e8a105c4: am
02b24ed2: am
b559b2dd: add vibrance fix a free in shadows
* commit '
e8a105c4b6e8b3b762feda4f6d487360312f30ea':
add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:37:05 +0000 (17:37 -0700)]
am
02b24ed2: am
b559b2dd: add vibrance fix a free in shadows
* commit '
02b24ed2e858d1dbef0d85bc485d4090dac47e17':
add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:34:36 +0000 (17:34 -0700)]
am
b559b2dd: add vibrance fix a free in shadows
* commit '
b559b2dd6637660ddbbdbae79a742c9f0fb1180b':
add vibrance fix a free in shadows
John Hoford [Thu, 4 Oct 2012 21:12:36 +0000 (14:12 -0700)]
add vibrance fix a free in shadows
bug:
7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
nicolasroard [Fri, 5 Oct 2012 00:28:41 +0000 (17:28 -0700)]
nicolasroard [Fri, 5 Oct 2012 00:26:07 +0000 (17:26 -0700)]
nicolasroard [Fri, 5 Oct 2012 00:24:08 +0000 (17:24 -0700)]
am
f8d0367e: am
5448bf80: Implement sharpen
* commit '
f8d0367ea29515689c58ac821434947a888d1ca4':
Implement sharpen
nicolasroard [Fri, 5 Oct 2012 00:22:24 +0000 (17:22 -0700)]
am
5448bf80: Implement sharpen
* commit '
5448bf8095483574649afcc2add7f153670c7450':
Implement sharpen
nicolasroard [Wed, 3 Oct 2012 04:57:22 +0000 (21:57 -0700)]
Implement sharpen
bug:
7279964
bug:
7247494
bug:
7234321
- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI
Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
George Mount [Thu, 4 Oct 2012 23:23:44 +0000 (16:23 -0700)]
am
098ab9e6: am
4b427d4e: am
9edd1a64: am
94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
* commit '
098ab9e631116494f3d0ee9deb6c78baa9dd9558':
Fix build break in tests
George Mount [Thu, 4 Oct 2012 23:22:26 +0000 (16:22 -0700)]
am
4b427d4e: am
9edd1a64: am
94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
* commit '
4b427d4e835f661e3b8070d2f9a82f3fc5c1cc4b':
Fix build break in tests
George Mount [Thu, 4 Oct 2012 23:20:09 +0000 (16:20 -0700)]
am
9edd1a64: am
94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
* commit '
9edd1a647f92ed1216c44ac85135eb4f732a7442':
Fix build break in tests
George Mount [Thu, 4 Oct 2012 23:18:47 +0000 (16:18 -0700)]
am
94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
* commit '
94805da05624e939ff402a9586cddacaf622a716':
Fix build break in tests
George Mount [Thu, 4 Oct 2012 23:17:19 +0000 (16:17 -0700)]
Merge "Fix build break in tests" into gb-ub-photos-arches
Baligh Uddin [Thu, 4 Oct 2012 23:03:59 +0000 (16:03 -0700)]
am
3e7a4285: (-s ours) am
6df10160: am
731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
3e7a42857cba633a896e0ba92ee44ab979a2b320':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 23:02:35 +0000 (16:02 -0700)]
am
6df10160: am
731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6df101606aa482431ac1902ba5f590749df8c74a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 23:00:11 +0000 (16:00 -0700)]
am
731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
731bd8aac8794bbfc53a863d6004ef761ae98bf0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:58:39 +0000 (15:58 -0700)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 4 Oct 2012 22:58:20 +0000 (15:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 4 Oct 2012 22:57:24 +0000 (15:57 -0700)]
am
a19b783f: (-s ours) am
6309dabf: am
38192a53: am
d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a19b783f27b9ff3522de0c0bde25e084ca83d398':
Import translations. DO NOT MERGE
George Mount [Thu, 4 Oct 2012 22:57:20 +0000 (15:57 -0700)]
Fix build break in tests
Bug
7259843
Change-Id: If40a7da72261039e3d6fcd3a00669ed7c900c658
Baligh Uddin [Thu, 4 Oct 2012 22:56:01 +0000 (15:56 -0700)]
am
6309dabf: am
38192a53: am
d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
6309dabff899b070bdb0674708eed47df9343ada':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:55:55 +0000 (15:55 -0700)]
am
3eae05ea: (-s ours) am
73eb2b23: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
3eae05ea57f73559be504a9f5b4f08abb17388d4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:54:29 +0000 (15:54 -0700)]
am
73eb2b23: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
73eb2b23d84cf956459265b00f4de8860aaf8ac0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:54:13 +0000 (15:54 -0700)]
am
38192a53: am
d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
38192a53e82e7e1cce99c79c37b352578936e3e2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:52:35 +0000 (15:52 -0700)]
am
d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d21ad73e2c209d54dea4d924eaba18df8b9bfb12':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 22:52:15 +0000 (15:52 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Thu, 4 Oct 2012 22:50:35 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 22:31:53 +0000 (15:31 -0700)]
am
67799f1e: am
5c2f9e70: am
b0057409: am
9c6c01dd: Fix build. Missing dummy class for Gallery2.
* commit '
67799f1eebb7dba9221c46269e66143ade6443d1':
Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:29:24 +0000 (15:29 -0700)]
am
5c2f9e70: am
b0057409: am
9c6c01dd: Fix build. Missing dummy class for Gallery2.
* commit '
5c2f9e708eccccac4f740888556376013f741162':
Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:27:18 +0000 (15:27 -0700)]
am
b0057409: am
9c6c01dd: Fix build. Missing dummy class for Gallery2.
* commit '
b005740953ac9e6a0a0d1014b4acfa9c9980e111':
Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:17:21 +0000 (15:17 -0700)]
am
9c6c01dd: Fix build. Missing dummy class for Gallery2.
* commit '
9c6c01ddd5b7fce725bf4b3cec317820b16963b8':
Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:04:23 +0000 (15:04 -0700)]
Fix build. Missing dummy class for Gallery2.
Bug
7259843
Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614
George Mount [Thu, 4 Oct 2012 21:52:48 +0000 (14:52 -0700)]
am
007c36f9: am
5b8fc893: am
d5e9f02d: am
29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
* commit '
007c36f9a4b809f65ed66a20da0b8b744b474e8e':
Support panorama progress items in Gallery.
George Mount [Thu, 4 Oct 2012 21:50:45 +0000 (14:50 -0700)]
am
5b8fc893: am
d5e9f02d: am
29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
* commit '
5b8fc893c160b5c0c9713663e76f4fc1dbe7c970':
Support panorama progress items in Gallery.
Bobby Georgescu [Thu, 4 Oct 2012 20:22:05 +0000 (13:22 -0700)]
Upscale images to fill screen for slideshow
Bug:
7110382
This fixes the slideshow mode on high-resolution
displays. Note that this will scale up screennails
to fill the screen even if they are fairly low quality.
The resolution to
7232758 will set the size of the
screennails appropriately based on screen size.
Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
Bobby Georgescu [Thu, 4 Oct 2012 18:15:43 +0000 (11:15 -0700)]
Snap back photo after swipe in y-direction in filmstrip
Bug:
7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
George Mount [Thu, 4 Oct 2012 21:48:12 +0000 (14:48 -0700)]
am
d5e9f02d: am
29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
* commit '
d5e9f02de0de89f4a04091e00a76fbd915ea7e2b':
Support panorama progress items in Gallery.
George Mount [Thu, 4 Oct 2012 21:45:41 +0000 (14:45 -0700)]
am
29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
* commit '
29b553a54cbe4d95c174121e4f956a74117a4fc9':
Support panorama progress items in Gallery.
George Mount [Thu, 4 Oct 2012 21:44:34 +0000 (14:44 -0700)]
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
Bobby Georgescu [Thu, 4 Oct 2012 21:09:31 +0000 (14:09 -0700)]
am
e0283b7e: am
b22f165f: am
41190e10: am
8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches
* commit '
e0283b7ec963e0e9a947c45fd2ea167fae4c6af2':
Don't allow switching to filmstrip in get content intent
Bobby Georgescu [Thu, 4 Oct 2012 21:07:45 +0000 (14:07 -0700)]
am
b22f165f: am
41190e10: am
8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches
* commit '
b22f165f770b8ce629f1c19d453e097c91913df0':
Don't allow switching to filmstrip in get content intent
Bobby Georgescu [Thu, 4 Oct 2012 21:06:42 +0000 (14:06 -0700)]
am
41190e10: am
8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches
* commit '
41190e100f3dd3e895d378f752c7f4661c690f88':
Don't allow switching to filmstrip in get content intent
Bobby Georgescu [Thu, 4 Oct 2012 21:04:02 +0000 (14:04 -0700)]
am
8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches
* commit '
8a415f457fe9fd18b369ac4ec354a33e3affcb94':
Don't allow switching to filmstrip in get content intent
Bobby Georgescu [Thu, 4 Oct 2012 21:02:36 +0000 (14:02 -0700)]
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
Bobby Georgescu [Thu, 4 Oct 2012 21:00:54 +0000 (14:00 -0700)]
am
a21931de: am
b5f150b4: am
3158c0f2: am
0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
* commit '
a21931dee23d3adfd57fb244a062003fb350bd29':
Upscale images to fill screen for slideshow
Bobby Georgescu [Thu, 4 Oct 2012 20:59:37 +0000 (13:59 -0700)]
am
b5f150b4: am
3158c0f2: am
0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
* commit '
b5f150b49df309d2ab197fb245a87304a36cdd98':
Upscale images to fill screen for slideshow
Bobby Georgescu [Thu, 4 Oct 2012 20:57:32 +0000 (13:57 -0700)]
am
3158c0f2: am
0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
* commit '
3158c0f214169dd7e1dc7ff50368f840cdcd148f':
Upscale images to fill screen for slideshow
Bobby Georgescu [Thu, 4 Oct 2012 20:55:38 +0000 (13:55 -0700)]
am
0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
* commit '
0eefb1733f5ff2e2f6f4846bdbd8873639b4d085':
Upscale images to fill screen for slideshow
Bobby Georgescu [Thu, 4 Oct 2012 20:54:04 +0000 (13:54 -0700)]
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
Bobby Georgescu [Thu, 4 Oct 2012 20:22:05 +0000 (13:22 -0700)]
Upscale images to fill screen for slideshow
Bug:
7110382
This fixes the slideshow mode on high-resolution
displays. Note that this will scale up screennails
to fill the screen even if they are fairly low quality.
The resolution to
7232758 will set the size of the
screennails appropriately based on screen size.
Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
Bobby Georgescu [Thu, 4 Oct 2012 19:28:45 +0000 (12:28 -0700)]
am
530c5eb2: am
83a23870: am
ca4241c8: am
b1a51397: Snap back photo after swipe in y-direction in filmstrip
* commit '
530c5eb26d12889ef35d42184e6da0aaaca92b67':
Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:59:01 +0000 (11:59 -0700)]
Don't allow switching to filmstrip in get content intent
Bug:
7288252
Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1
Bobby Georgescu [Thu, 4 Oct 2012 18:51:45 +0000 (11:51 -0700)]
am
83a23870: am
ca4241c8: am
b1a51397: Snap back photo after swipe in y-direction in filmstrip
* commit '
83a238707a694c114af852b104b79d9681de13e5':
Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:49:56 +0000 (11:49 -0700)]
am
ca4241c8: am
b1a51397: Snap back photo after swipe in y-direction in filmstrip
* commit '
ca4241c8e87434636ccc29468f700e83ecd83a46':
Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:47:54 +0000 (11:47 -0700)]
am
b1a51397: Snap back photo after swipe in y-direction in filmstrip
* commit '
b1a513974d59c1dc14e004338b6795d6c3c5e5e8':
Snap back photo after swipe in y-direction in filmstrip
Angus Kong [Wed, 19 Sep 2012 12:39:45 +0000 (20:39 +0800)]
Support panorama progress items in Gallery.
Bug
7259843
Add dummy files for showing panorama progress in filmstrip.
Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74
Baligh Uddin [Thu, 4 Oct 2012 18:42:34 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icfca5ad7f33b0a4411bf9911a5bac1edf1483b2e
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 18:42:08 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3617a67379099fca54cf0a4978f46b449e40e288
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 18:41:43 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e9d06aa3203358693ddca94f21c238853d5d17a
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Oct 2012 18:40:56 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22d72c397ef2202c44673b5c5cc1b602e45600d8
Auto-generated-cl: translation import
Bobby Georgescu [Thu, 4 Oct 2012 18:15:43 +0000 (11:15 -0700)]
Snap back photo after swipe in y-direction in filmstrip
Bug:
7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
Romain Guy [Thu, 4 Oct 2012 18:13:19 +0000 (11:13 -0700)]
Romain Guy [Thu, 4 Oct 2012 18:10:41 +0000 (11:10 -0700)]
Romain Guy [Thu, 4 Oct 2012 18:09:21 +0000 (11:09 -0700)]
am
a4ca12ee: Merge "@#!0 Bug #
7275145" into jb-mr1-dev
* commit '
a4ca12ee030fa79403b5e2cde20238a99c6e8673':
@#!$# Bug #
7275145
Romain Guy [Thu, 4 Oct 2012 18:07:25 +0000 (11:07 -0700)]
Merge "@#!$# Bug #
7275145" into jb-mr1-dev
The Android Open Source Project [Thu, 4 Oct 2012 14:52:25 +0000 (07:52 -0700)]
am
30c0e8ad: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
30c0e8adbcc4a7be4d52332425344273b79335ec':
Fix ANR in image editor
The Android Open Source Project [Thu, 4 Oct 2012 14:49:33 +0000 (07:49 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Id46d9e98b81fc5767e484afbca9660350932059d
Pin Ting [Thu, 4 Oct 2012 14:01:58 +0000 (07:01 -0700)]
am
123f9904: am
19dddb99: am
31bf2be0: am
2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
* commit '
123f99045ff10815b2e0ff6b07cb8cf27e78a692':
Accelerate PNG image rendering.
Pin Ting [Thu, 4 Oct 2012 14:00:15 +0000 (07:00 -0700)]
am
19dddb99: am
31bf2be0: am
2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
* commit '
19dddb99eaf6c5587e209f8a9a5e41e17755a2e4':
Accelerate PNG image rendering.
The Android Automerger [Thu, 4 Oct 2012 14:00:08 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Pin Ting [Thu, 4 Oct 2012 13:57:56 +0000 (06:57 -0700)]
am
31bf2be0: am
2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
* commit '
31bf2be07efdecc91f0e72e5fd2d3750fa1755c8':
Accelerate PNG image rendering.
Pin Ting [Thu, 4 Oct 2012 13:56:13 +0000 (06:56 -0700)]
am
2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
* commit '
2abc1350cde24e810f6437592f099c149ce19ada':
Accelerate PNG image rendering.
Pin Ting [Thu, 4 Oct 2012 13:54:47 +0000 (06:54 -0700)]
Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
Hung-ying Tyan [Thu, 4 Oct 2012 10:49:01 +0000 (18:49 +0800)]
Open album in filmstrip only if the item exists.
Metadata of picasa photos may not be available when user taps to view a picasa
album. Cannot enter PhotoPage directly in such a case.
Bug:
7213464
Change-Id: Ife2e8768fc9b8d8757235610a02f029f40205b5b
OSDN Git Service
