OSDN Git Service
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
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: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
Eric Fischer [Tue, 1 May 2012 20:31:26 +0000 (13:31 -0700)]
am
814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
814360ae97d59e333440076b5517fff0c6be5ca9':
Import translations. DO NOT MERGE
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:35:30 +0000 (10:35 -0700)]
am
1f0f6c7e: Import translations. DO NOT MERGE
* commit '
1f0f6c7ec233e25601b6f035d75a65aa19ea9a5e':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 17:28:09 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a1227b0df7f6744d13a263ea433ccadccc76be8
Yuli Huang [Tue, 1 May 2012 14:59:46 +0000 (07:59 -0700)]
am
dd97a122: Increase localization string limit.
* commit '
dd97a122cc8992c31d0ded4313b925fa5612dbf1':
Increase localization string limit.
The Android Automerger [Tue, 1 May 2012 14:04:41 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Tue, 1 May 2012 13:49:54 +0000 (06:49 -0700)]
am
86c2de0e: am
5e73eda6: Merge "Add missing xhdpi icon to Gallery2"
* commit '
86c2de0e1e09633be5e2de56ecb2a7efcc08305e':
Add missing xhdpi icon to Gallery2
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 18:50:26 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c
Eric Fischer [Mon, 30 Apr 2012 17:45:08 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660
The Android Automerger [Mon, 30 Apr 2012 14:04:29 +0000 (07:04 -0700)]
merge in jb-release history after reset to 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
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
The Android Automerger [Thu, 26 Apr 2012 14:04:41 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Wed, 25 Apr 2012 17:35:01 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I725031b6fd65e573b5852b98aace63bd8ebe15e8
The Android Automerger [Wed, 25 Apr 2012 14:48:47 +0000 (07:48 -0700)]
merge in jb-release history after reset to jb-dev
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
Eric Fischer [Tue, 24 Apr 2012 17:59:08 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3
The Android Automerger [Tue, 24 Apr 2012 14:04:23 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
The Android Automerger [Mon, 23 Apr 2012 14:05:26 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
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: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"
Björn Lundén [Sun, 22 Apr 2012 15:44:16 +0000 (17:44 +0200)]
Add missing xhdpi icon to Gallery2
Change-Id: Ie20b8c71e9082f229f66253c0a0a5d7acf6a532c
Eric Fischer [Fri, 20 Apr 2012 18:05:00 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5aa8ee935dca1e7d44d6b59b43c52d3241ed9b0
Eric Fischer [Thu, 19 Apr 2012 18:05:50 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00bdda6e887bda0b9248d1366a52350786fa7cbb
The Android Automerger [Thu, 19 Apr 2012 14:04:25 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
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
Eric Fischer [Wed, 18 Apr 2012 18:37:24 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1
The Android Automerger [Wed, 18 Apr 2012 14:04:29 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Tue, 17 Apr 2012 18:29:10 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14
The Android Automerger [Tue, 17 Apr 2012 14:04:00 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
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
The Android Automerger [Mon, 16 Apr 2012 14:05:04 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Fri, 13 Apr 2012 18:04:20 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6
The Android Automerger [Mon, 9 Apr 2012 14:05:46 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
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
Eric Fischer [Thu, 5 Apr 2012 19:26:25 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1
The Android Automerger [Wed, 4 Apr 2012 14:05:55 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Mike Lockwood [Tue, 3 Apr 2012 17:52:23 +0000 (10:52 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
The Android Automerger [Tue, 3 Apr 2012 10:33:19 +0000 (03:33 -0700)]
merge in jb-release history after reset to master
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
Chih-Chung Chang [Mon, 2 Apr 2012 09:31:55 +0000 (17:31 +0800)]
Remove FilmStripView.
Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
Ray Chen [Mon, 2 Apr 2012 04:07:58 +0000 (12:07 +0800)]
Fix b/
6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
This CL removes the cancel options, the next one will address the undo feature.
Change-Id: I99bb24fee0add0ffe6b4fcc9d32528abdd0ed418
The Android Automerger [Mon, 26 Mar 2012 14:06:01 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Fri, 23 Mar 2012 18:08:39 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie08a098ada3db0dd6b6791a117997c6c5cb043e9
The Android Automerger [Wed, 21 Mar 2012 14:04:48 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Chih-Chung Chang [Thu, 15 Mar 2012 08:38:45 +0000 (16:38 +0800)]
Create a ScreenNail interface so we can add other types of screenails.
Add a new MediaItem type to contain a ScreenNail.
Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
OSDN Git Service
