OSDN Git Service

android-x86/packages-apps-Camera2.git
12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 29 May 2012 15:59:46 +0000 (08:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoAdd 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

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 24 May 2012 14:01:24 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev
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

12 years agoUpdating launcher icon to fix alignment. Bug: 6511716
Christian Robertson [Wed, 23 May 2012 18:59:51 +0000 (11:59 -0700)]
Updating launcher icon to fix alignment. Bug:  6511716

Change-Id: Icf1ab8d7cce0217717db3044366280248e093a86

12 years agoMerge "Put a black View in front of SurfaceView." into jb-dev
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

12 years agomerge in jb-release history after reset to 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

12 years agoPut a black View in front of SurfaceView.
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

12 years agoFix 6259517 "0 images / videos available" toast is displayed in gallery on launch...
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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 22 May 2012 14:06:38 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoFix 6513486: Extend char limit from 30 to 50.
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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 20 May 2012 14:39:51 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoFix 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

12 years agoSet 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 17 May 2012 14:04:59 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoFix 6213053 Add Help entry point to Gallery (targeted for J release)
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

12 years agoRemove 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

12 years agoRestore 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

12 years agoRestore 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

12 years agoImport 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

12 years agomerge in jb-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

12 years agoMerge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsisten...
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

12 years agoFix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with...
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

12 years agoImport 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

12 years agomerge in jb-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

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 9 May 2012 14:47:24 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 8 May 2012 15:23:16 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 6 May 2012 21:21:58 +0000 (14:21 -0700)]
merge in jb-release history after reset to jb-dev

12 years agomerge 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

12 years agoImport 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

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 21:56:25 +0000 (14:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 3 May 2012 20:53:08 +0000 (13:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 3 May 2012 14:18:06 +0000 (07:18 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoMerge "Add camera icon for camera roll." into jb-dev
Chih-Chung Chang [Thu, 3 May 2012 10:32:06 +0000 (03:32 -0700)]
Merge "Add camera icon for camera roll." into jb-dev

12 years agoAdd camera icon for camera roll.
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

12 years agoSimplify 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

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 2 May 2012 14:09:21 +0000 (07:09 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoFix '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

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 1 May 2012 20:28:45 +0000 (13:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 1 May 2012 18:36:07 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I17da847d9cf238a770caa867bd27ea227797d71f

12 years agoImport 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

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 1 May 2012 14:04:41 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoIncrease localization string limit.
Yuli Huang [Mon, 30 Apr 2012 23:12:23 +0000 (07:12 +0800)]
Increase localization string limit.

bug:6421026
Change-Id: I8a296c37287605680eaaeda5765257cf45d5fc8e

12 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:56:32 +0000 (13:56 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 18:50:26 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 17:45:08 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 30 Apr 2012 14:04:29 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoExpose delete button in action bar in portrait.
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

12 years agoMerge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 27 Apr 2012 17:38:35 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5f364684f5e0d05d5e8cbbef3d4b6bbc40229061

12 years agoMake 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 26 Apr 2012 18:22:49 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6b49535f98a414ec3c7989099d09f37a70ff5e00

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 26 Apr 2012 14:04:41 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 25 Apr 2012 17:35:01 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I725031b6fd65e573b5852b98aace63bd8ebe15e8

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Apr 2012 14:48:47 +0000 (07:48 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoIncrease blue layer alpha to make highlights more evident.
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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 24 Apr 2012 17:59:08 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 24 Apr 2012 14:04:23 +0000 (07:04 -0700)]
merge in jb-release history after reset to master

12 years agomerge 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

12 years agoFix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with...
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

12 years agoMerge "Fix 6046987 The header on the contextual action bar when multiple photos are...
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"

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 20 Apr 2012 18:05:00 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id5aa8ee935dca1e7d44d6b59b43c52d3241ed9b0

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 19 Apr 2012 18:05:50 +0000 (11:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I00bdda6e887bda0b9248d1366a52350786fa7cbb

12 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 19 Apr 2012 14:04:25 +0000 (07:04 -0700)]
merge in jb-release history after reset to master

12 years agoFix 6046987 The header on the contextual action bar when multiple photos are selected...
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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 18 Apr 2012 18:37:24 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 18 Apr 2012 14:04:29 +0000 (07:04 -0700)]
merge in jb-release history after reset to master

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 17 Apr 2012 18:29:10 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 17 Apr 2012 14:04:00 +0000 (07:04 -0700)]
merge in jb-release history after reset to master

12 years agoFix b/6213053 Add Help entry point to Gallery (targeted for J release)
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

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 16 Apr 2012 14:05:04 +0000 (07:05 -0700)]
merge in jb-release history after reset to master

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 13 Apr 2012 18:04:20 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 9 Apr 2012 14:05:46 +0000 (07:05 -0700)]
merge in jb-release history after reset to master

12 years agoDraw less to improve performance.
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

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 19:26:25 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 4 Apr 2012 14:05:55 +0000 (07:05 -0700)]
merge in jb-release history after reset to master

12 years agoMerge remote-tracking branch 'goog/ics-aah'
Mike Lockwood [Tue, 3 Apr 2012 17:52:23 +0000 (10:52 -0700)]
Merge remote-tracking branch 'goog/ics-aah'

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 3 Apr 2012 10:33:19 +0000 (03:33 -0700)]
merge in jb-release history after reset to master

12 years agoMerge "Fix b/6046544 Deleting a photo takes multiple steps and the flow is inconsiste...
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"

12 years agoMerge "Fix b/5974240: Sliders may not be responsive to touches."
Yuli Huang [Tue, 3 Apr 2012 09:02:29 +0000 (02:02 -0700)]
Merge "Fix b/5974240: Sliders may not be responsive to touches."

12 years agoFix 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

12 years agoRemove FilmStripView.
Chih-Chung Chang [Mon, 2 Apr 2012 09:31:55 +0000 (17:31 +0800)]
Remove FilmStripView.

Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42

12 years agoFix b/6046544 Deleting a photo takes multiple steps and the flow is inconsistent...
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

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 26 Mar 2012 14:06:01 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 23 Mar 2012 18:08:39 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie08a098ada3db0dd6b6791a117997c6c5cb043e9

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 21 Mar 2012 14:04:48 +0000 (07:04 -0700)]
merge in jb-release history after reset to master

12 years agoCreate a ScreenNail interface so we can add other types of screenails.
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

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 19 Mar 2012 14:05:07 +0000 (07:05 -0700)]
merge in jb-release history after reset to master

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 15 Mar 2012 18:44:41 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I49d04d1c50230fbd0af5046d7df4a2a86a3b4b05

12 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 15 Mar 2012 15:59:38 +0000 (08:59 -0700)]
merge in jb-release history after reset to master

12 years agoMerge "Fix 5406844 Category switcher does not highlight current selection"
Ray Chen [Thu, 15 Mar 2012 00:47:31 +0000 (17:47 -0700)]
Merge "Fix 5406844 Category switcher does not highlight current selection"

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 14 Mar 2012 14:05:00 +0000 (07:05 -0700)]
merge in jb-release history after reset to master

12 years agoReorganize import for all files.
Owen Lin [Wed, 14 Mar 2012 09:27:24 +0000 (17:27 +0800)]
Reorganize import for all files.

Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 13 Mar 2012 14:04:38 +0000 (07:04 -0700)]
merge in jb-release history after reset to master