OSDN Git Service
Ying Wang [Wed, 20 Jun 2012 17:22:27 +0000 (10:22 -0700)]
am
705d8085: Import translations. DO NOT MERGE
* commit '
705d808558fd3e165fd787b8628aae7db084e764':
Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 16:42:55 +0000 (09:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b28f69652740d7e0f0a9e55ec40c9b710986391
The Android Open Source Project [Wed, 20 Jun 2012 15:26:03 +0000 (08:26 -0700)]
Reconcile with jb-release
Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
The Android Automerger [Wed, 20 Jun 2012 14:03:33 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 19 Jun 2012 20:25:41 +0000 (13:25 -0700)]
am
8c93a140: Import translations. DO NOT MERGE
* commit '
8c93a140f61d2880163dcc7dc99fa177aa4f0b2b':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 20:23:08 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibcd085099f2a66292ff49a84cf05910b430fe147
The Android Open Source Project [Tue, 19 Jun 2012 14:16:01 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
The Android Automerger [Tue, 19 Jun 2012 14:04:48 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:13:51 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
Ying Wang [Mon, 18 Jun 2012 17:39:47 +0000 (10:39 -0700)]
am
c66604cb: Import translations. DO NOT MERGE
* commit '
c66604cb29e0402ecbeb37ab79d9db0851fce3ec':
Import translations. DO NOT MERGE
Chih-Chung Chang [Mon, 18 Jun 2012 17:35:56 +0000 (10:35 -0700)]
am
6b891c6a: Add swipe-to-delete gesture.
* commit '
6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25':
Add swipe-to-delete gesture.
Ying Wang [Mon, 18 Jun 2012 17:22:03 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I68a09a0a51b46c4929d725dbd22d2176fadba8c6
Chih-Chung Chang [Thu, 7 Jun 2012 12:09:13 +0000 (20:09 +0800)]
Add swipe-to-delete gesture.
Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
The Android Automerger [Wed, 13 Jun 2012 15:45:06 +0000 (08:45 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Tue, 12 Jun 2012 19:45:56 +0000 (12:45 -0700)]
am
6dd67099: Import translations. DO NOT MERGE
* commit '
6dd670997a88fe7502f9ce0e4f9c872b7352027f':
Import translations. DO NOT MERGE
Ying Wang [Tue, 12 Jun 2012 18:50:53 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id76289427ddecca985371b6d11e3e1fcb7f8b49f
The Android Open Source Project [Mon, 11 Jun 2012 16:22:41 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711
The Android Automerger [Mon, 11 Jun 2012 14:03:51 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 8 Jun 2012 23:32:09 +0000 (16:32 -0700)]
am
1d3a2ec8: Import translations. DO NOT MERGE
* commit '
1d3a2ec89bd286f253f1f050f7e9e5406119273b':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 8 Jun 2012 23:26:27 +0000 (16:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601
The Android Open Source Project [Thu, 7 Jun 2012 14:51:25 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
The Android Automerger [Thu, 7 Jun 2012 14:03:57 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 6 Jun 2012 18:01:47 +0000 (11:01 -0700)]
am
699ef52c: Import translations. DO NOT MERGE
* commit '
699ef52cb398a2d5a7ec962e7df2837a6dbccef4':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 6 Jun 2012 17:56:12 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b
The Android Automerger [Wed, 6 Jun 2012 14:03:47 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Wei Huang [Tue, 5 Jun 2012 18:08:59 +0000 (11:08 -0700)]
am
1b27f309: Merge "Update drawable for the new resize handles." into jb-dev
* commit '
1b27f3096d814d7b2a536dde59d7dbfc91945a05':
Update drawable for the new resize handles.
Wei Huang [Tue, 5 Jun 2012 18:07:14 +0000 (11:07 -0700)]
Merge "Update drawable for the new resize handles." into jb-dev
Eric Fischer [Tue, 5 Jun 2012 16:47:02 +0000 (09:47 -0700)]
am
49661d3f: Import translations. DO NOT MERGE
* commit '
49661d3f313d32620cb15247a46e593e333a778d':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 5 Jun 2012 16:39:21 +0000 (09:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b315a50d72129caf734b5d7279e352e73d74cdb
The Android Automerger [Tue, 5 Jun 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Tue, 5 Jun 2012 10:28:16 +0000 (18:28 +0800)]
Update drawable for the new resize handles.
bug:
6598235
Change-Id: Id765f4024ad2896b3f172dce3408b2634fb1eb18
Eric Fischer [Mon, 4 Jun 2012 21:56:25 +0000 (14:56 -0700)]
am
b4343fb4: Import translations. DO NOT MERGE
* commit '
b4343fb4517a760f09fb383b7b382ac793e01144':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 4 Jun 2012 21:44:28 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e
The Android Automerger [Sun, 3 Jun 2012 13:04:40 +0000 (06:04 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:57:17 +0000 (18:57 -0700)]
Merge
79b8f0b7
Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac
Christian Robertson [Fri, 1 Jun 2012 18:11:49 +0000 (11:11 -0700)]
Adding xhdpi version of app icon. Bug:
6596419
Change-Id: I6f8b044d14854f41a4ba788756045f1ee1f56759
Eric Fischer [Fri, 1 Jun 2012 18:00:46 +0000 (11:00 -0700)]
am
8da8d1d4: Import translations. DO NOT MERGE
* commit '
8da8d1d488698ce545ca056f119a03a4f4b189ec':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 1 Jun 2012 17:19:04 +0000 (10:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie58fbc6fe46cbf13cf54a0db03d50bda43f778de
Eric Fischer [Thu, 31 May 2012 18:14:09 +0000 (11:14 -0700)]
am
a72d51b6: Import translations. DO NOT MERGE
* commit '
a72d51b6a4b5dadc0dea91882e0cdafc97c652b3':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 31 May 2012 17:58:53 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I854fe48674bc25b209370d0e943bba9704fdf3cd
The Android Automerger [Thu, 31 May 2012 14:04:25 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 30 May 2012 17:35:20 +0000 (10:35 -0700)]
am
c23258a5: Import translations. DO NOT MERGE
* commit '
c23258a525b475666e4bff21da72a9c8a93e4971':
Import translations. DO NOT MERGE
The Android Open Source Project [Wed, 30 May 2012 17:16:02 +0000 (10:16 -0700)]
Reconcile with jb-release
Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
Eric Fischer [Wed, 30 May 2012 17:10:02 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbc7268dabbede56d3fddb73f3513b8bdcde6a8d
The Android Automerger [Wed, 30 May 2012 14:04:40 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 29 May 2012 19:08:08 +0000 (12:08 -0700)]
am
cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cde8d1762af242a89aeea6062b185e7717da5a62':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 19:06:01 +0000 (12:06 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 29 May 2012 18:56:21 +0000 (11:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id68af15d8c2c99947e9118446736fda1a588769a
Eric Fischer [Tue, 29 May 2012 18:51:57 +0000 (11:51 -0700)]
am
fd08e675: Import translations. DO NOT MERGE
* commit '
fd08e675f3d83594bb7e78577d40fea1537a4935':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 17:57:57 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief5e6efb118d8e5b229736a5a4c3a22d5b8f796c
Wei Huang [Tue, 29 May 2012 16:54:41 +0000 (09:54 -0700)]
am
20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
* commit '
20d558a1b9d5f0e2b6cf4fa2b7d38b5a5ce8acf6':
Fix over-sized images in drawable-sw600dp.
Wei Huang [Tue, 29 May 2012 16:52:43 +0000 (09:52 -0700)]
Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
The Android Open Source Project [Tue, 29 May 2012 16:41:17 +0000 (09:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
The Android Automerger [Tue, 29 May 2012 15:59:46 +0000 (08:59 -0700)]
merge in jb-release history after reset to jb-dev
Hung-ying Tyan [Sat, 26 May 2012 00:17:22 +0000 (08:17 +0800)]
Fix over-sized images in drawable-sw600dp.
We have both drawable-sw600dp/ and drawable-sw600dp-mdpi/. We are getting
images from drawable-sw600dp/ and they are too large. Those over-sized images
are removed, and to avoid confusion, move the images in drawable-sw600dp-mdpi/
to drawable-sw600dp/.
Bug:
6549010
Change-Id: Ibd6dea8aec3740c4e6d5992ccdba3518fbb89a23
Owen Lin [Fri, 25 May 2012 23:42:30 +0000 (16:42 -0700)]
am
00bb8e43: Add back the background when we show the action bar
* commit '
00bb8e439e33848d679a4404c203af9ed1a06a19':
Add back the background when we show the action bar
Owen Lin [Wed, 23 May 2012 22:47:36 +0000 (15:47 -0700)]
Add back the background when we show the action bar
This change fix the following UI issues:
1. We add a black backgorund when ActionBar shows and remove it
when we hide the action bar.
2. Make the postion of video stable when opening
3. Prevent glitching when opening a video
4. Make it really full-screen.
5. Hide ControlOverlay at begining.
bug:
6519765
bug:
6491674
Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
Eric Fischer [Fri, 25 May 2012 18:32:39 +0000 (11:32 -0700)]
am
ceab9f07: Import translations. DO NOT MERGE
* commit '
ceab9f07470e899c2ff34d4ddd4a43395a9f6523':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 18:26:03 +0000 (11:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ica289f7c9b3b9fcb792be31e2088300cd1d5ac92
The Android Automerger [Thu, 24 May 2012 17:19:07 +0000 (10:19 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Thu, 24 May 2012 16:01:34 +0000 (09:01 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f
The Android Automerger [Thu, 24 May 2012 14:01:24 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev
Christian Robertson [Wed, 23 May 2012 21:04:36 +0000 (14:04 -0700)]
am
83bb96be: Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
* commit '
83bb96be9e602ed81c03cbb48e20471ebb235d25':
Updating launcher icon to fix alignment. Bug:
6511716
Christian Robertson [Wed, 23 May 2012 21:01:12 +0000 (14:01 -0700)]
Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
Christian Robertson [Wed, 23 May 2012 18:59:51 +0000 (11:59 -0700)]
Updating launcher icon to fix alignment. Bug:
6511716
Change-Id: Icf1ab8d7cce0217717db3044366280248e093a86
Chih-Chung Chang [Wed, 23 May 2012 17:57:01 +0000 (10:57 -0700)]
am
6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev
* commit '
6673c21275772af55c9ae72cd78cbbe710edc023':
Put a black View in front of SurfaceView.
Chih-Chung Chang [Wed, 23 May 2012 17:54:16 +0000 (10:54 -0700)]
Merge "Put a black View in front of SurfaceView." into jb-dev
The Android Automerger [Wed, 23 May 2012 14:03:50 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Wei Huang [Wed, 23 May 2012 04:59:43 +0000 (21:59 -0700)]
am
13188c88: Merge "Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
* commit '
13188c884a93f6086cbf4e860fb6dfcbc44c6e13':
Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
Chih-Chung Chang [Wed, 23 May 2012 04:26:36 +0000 (21:26 -0700)]
Put a black View in front of SurfaceView.
This prevents SurfaceView from being transparent before the first draw.
Bug:
6507478
Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
Ray Chen [Thu, 17 May 2012 04:29:12 +0000 (12:29 +0800)]
Fix
6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
And removed sync error toast.
Bug:
6259517
Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
The Android Automerger [Tue, 22 May 2012 20:25:07 +0000 (13:25 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:06:49 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a
The Android Automerger [Tue, 22 May 2012 14:06:38 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Wei Huang [Mon, 21 May 2012 20:01:07 +0000 (13:01 -0700)]
am
d7ebcd2f: Merge "Fix
6513486: Extend char limit from 30 to 50. b:
6513486" into jb-dev
* commit '
d7ebcd2fef383f0a68b6af40e15bee81f3ec5c4b':
Fix
6513486: Extend char limit from 30 to 50. b:
6513486
Ray Chen [Fri, 18 May 2012 00:41:33 +0000 (08:41 +0800)]
Fix
6513486: Extend char limit from 30 to 50.
b:
6513486
Change-Id: I1d4cdd7e1c0a5019458778120f6be9e5b0492e1b
The Android Automerger [Sun, 20 May 2012 14:39:51 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Sat, 19 May 2012 01:43:57 +0000 (18:43 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I00d1e51120d9a41e8d5e33646f9f86e852e0631e
The Android Automerger [Fri, 18 May 2012 17:49:15 +0000 (10:49 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Yuli Huang [Fri, 18 May 2012 08:39:02 +0000 (01:39 -0700)]
am
c9f743a7: Fix action-bar title for cropping wallpaper.
* commit '
c9f743a777cf5e5e91bad7810584be052db21eed':
Fix action-bar title for cropping wallpaper.
Yuli Huang [Fri, 18 May 2012 08:12:32 +0000 (16:12 +0800)]
Fix action-bar title for cropping wallpaper.
bug:
6513495
Change-Id: I97b76c948d5c9fa0bb11f2fe89a0d10f490dbe14
Owen Lin [Thu, 17 May 2012 19:47:35 +0000 (12:47 -0700)]
am
59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev
* commit '
59d6f1b97c7159dd9faead8872f2d583dbb49ac8':
Set the window backgrond and remove it in onCreate().
Owen Lin [Wed, 16 May 2012 00:52:09 +0000 (17:52 -0700)]
Set the window backgrond and remove it in onCreate().
To have better transistion when launching the app.
bug:
6494653
Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570
Ray Chen [Thu, 17 May 2012 16:35:00 +0000 (09:35 -0700)]
am
b4e38c9a: Merge "Fix
6213053 Add Help entry point to Gallery (targeted for J release) b:
6213053" into jb-dev
* commit '
b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6':
Fix
6213053 Add Help entry point to Gallery (targeted for J release) b:
6213053
The Android Automerger [Thu, 17 May 2012 14:04:59 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ray Chen [Thu, 17 May 2012 08:37:13 +0000 (16:37 +0800)]
Fix
6213053 Add Help entry point to Gallery (targeted for J release)
b:
6213053
Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad
Owen Lin [Thu, 17 May 2012 01:31:34 +0000 (18:31 -0700)]
am
cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev
* commit '
cb1a39a26ae491185f92cf33fea0205331f8447f':
Remove the black layer in MovieActivity.
Owen Lin [Wed, 16 May 2012 20:52:02 +0000 (13:52 -0700)]
Remove the black layer in MovieActivity.
bug:
6491674
Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da
Eric Fischer [Wed, 16 May 2012 18:29:06 +0000 (11:29 -0700)]
Restore deleted string still referenced from menu resource.
Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
Eric Fischer [Wed, 16 May 2012 18:31:38 +0000 (11:31 -0700)]
am
bc8d5327: Restore deleted string still referenced from menu resource.
* commit '
bc8d532738a130474969b7bb158848acd9645bf1':
Restore deleted string still referenced from menu resource.
Eric Fischer [Wed, 16 May 2012 18:29:06 +0000 (11:29 -0700)]
Restore deleted string still referenced from menu resource.
Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
Eric Fischer [Wed, 16 May 2012 17:48:18 +0000 (10:48 -0700)]
am
a30d822e: Import translations. DO NOT MERGE
* commit '
a30d822e6034b3182eca341b4e76f5ecaf484e7a':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 16 May 2012 17:41:05 +0000 (10:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie35416e91d38c143eaa7d2898d60215d534c0ae6
The Android Open Source Project [Wed, 16 May 2012 15:41:02 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf
The Android Automerger [Wed, 16 May 2012 14:46:15 +0000 (07:46 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 14:04:50 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ray Chen [Wed, 16 May 2012 03:29:53 +0000 (20:29 -0700)]
am
3349078e: Merge "Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
* commit '
3349078ecd14bb462756c5c1a3a3b594d5b97cb9':
Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Ray Chen [Wed, 16 May 2012 01:22:13 +0000 (18:22 -0700)]
Merge "Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
Ray Chen [Tue, 15 May 2012 03:22:21 +0000 (11:22 +0800)]
Fix
6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
Per request, change the confirm dialog message to "Delete the selected item(s)?"
b:
6046544
Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
Eric Fischer [Tue, 15 May 2012 22:33:27 +0000 (15:33 -0700)]
am
66e52983: Import translations. DO NOT MERGE
* commit '
66e5298344f12aeb1a652f8731609f7959e15385':
Import translations. DO NOT MERGE