OSDN Git Service
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
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
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
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
Eric Fischer [Tue, 15 May 2012 22:29:21 +0000 (15:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6a4cfc400038645f49db5604b6bd58b5207aa96
The Android Automerger [Tue, 15 May 2012 16:35:45 +0000 (09:35 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Tue, 15 May 2012 14:05:34 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Tue, 15 May 2012 02:33:26 +0000 (19:33 -0700)]
am
00af9fc9: Import translations. DO NOT MERGE
* commit '
00af9fc9bc8a2eefd3e506ce23fc00c67b1c8be9':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 14 May 2012 18:24:28 +0000 (11:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6c64cb7f77eeae21d806cd2bcf0c72784fb433a
The Android Automerger [Wed, 9 May 2012 14:47:24 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 9 May 2012 08:48:01 +0000 (01:48 -0700)]
am
b79e7627: Import translations. DO NOT MERGE
* commit '
b79e762798b55d6551c5b78ec09c8234415ac3b5':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 8 May 2012 19:17:19 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92195544c0e69468c5aab4e7132d6e5d8ce53945
The Android Automerger [Tue, 8 May 2012 15:23:16 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Mon, 7 May 2012 20:17:12 +0000 (13:17 -0700)]
am
dc0e7625: Import translations. DO NOT MERGE
* commit '
dc0e7625d69cce4c933f927c0f9474c951abe758':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 7 May 2012 19:09:28 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5
The Android Automerger [Sun, 6 May 2012 21:21:58 +0000 (14:21 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 4 May 2012 23:15:21 +0000 (16:15 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 4 May 2012 20:27:13 +0000 (13:27 -0700)]
am
3191875f: Import translations. DO NOT MERGE
* commit '
3191875f78461ae828d689e9607ff152adbc73fe':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 4 May 2012 19:05:03 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e32bdca2eaa33696ebf0ef14df3c78de98e99d9
Eric Fischer [Thu, 3 May 2012 21:59:26 +0000 (14:59 -0700)]
am
b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
b3dc6118590bd14906bcc83162ee01f2e28a72d1':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 21:56:25 +0000 (14:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 20:53:08 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8
Eric Fischer [Thu, 3 May 2012 19:55:23 +0000 (12:55 -0700)]
am
92b5162f: Import translations. DO NOT MERGE
* commit '
92b5162fc3edb48dcda5019881fdad1f70f0cb16':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 19:48:21 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefc176de3ac6c1b849ced8c547ea35c3db68834b
The Android Automerger [Thu, 3 May 2012 14:18:06 +0000 (07:18 -0700)]
merge in jb-release history after reset to jb-dev
Chih-Chung Chang [Thu, 3 May 2012 10:34:03 +0000 (03:34 -0700)]
am
609a25b9: Merge "Add camera icon for camera roll." into jb-dev
* commit '
609a25b98a576e788c3eff507bc162616d1e64bd':
Add camera icon for camera roll.
Chih-Chung Chang [Thu, 3 May 2012 10:32:06 +0000 (03:32 -0700)]
Merge "Add camera icon for camera roll." into jb-dev
Chih-Chung Chang [Thu, 3 May 2012 09:53:05 +0000 (17:53 +0800)]
Add camera icon for camera roll.
Bug:
6411709
Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
Yuli Huang [Thu, 3 May 2012 09:38:29 +0000 (02:38 -0700)]
am
2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
* commit '
2f61a1c91f323ecd4ea5e385eb2b543517a23a0d':
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
Yuli Huang [Thu, 3 May 2012 07:59:23 +0000 (15:59 +0800)]
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
Simplify the dialog options to confirm if the user wants to discard
unsaved edited photo, similar to MMS asking if the user wants to discard
the unsent message.
bug:
6436477
Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
Eric Fischer [Wed, 2 May 2012 19:20:25 +0000 (12:20 -0700)]
am
d570731b: Import translations. DO NOT MERGE
* commit '
d570731b3946566c38984487a719e9b0f5e8cd6c':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 2 May 2012 18:06:12 +0000 (11:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d90a523de8148c14e643b3d81e5d1be7108a86
The Android Automerger [Wed, 2 May 2012 14:09:21 +0000 (07:09 -0700)]
merge in jb-release history after reset to jb-dev
Yuli Huang [Wed, 2 May 2012 10:44:58 +0000 (03:44 -0700)]
am
f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors.
* commit '
f50ce2b708c0c70930a346206fdd526f53ae6004':
Fix 'Edit' and 'Crop' behaviors.
Yuli Huang [Tue, 1 May 2012 16:50:56 +0000 (00:50 +0800)]
Fix 'Edit' and 'Crop' behaviors.
1. Make Gallery show edited local photo after resuming, similar to how
it shows cropped local photo after resuming.
2. Fix inconsistency between cropping local/PWA photo.
bug:
6168430
Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
OSDN Git Service
