OSDN Git Service

android-x86/packages-apps-Camera2.git
12 years agoam 00bb8e43: Add back the background when we show the action bar
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

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 agoam ceab9f07: Import translations. DO NOT MERGE
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

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 agoReconcile with jb-release nakasi-factoryrom-release
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

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 agoam 83bb96be: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into...
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

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 agoam 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev
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.

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 agoam 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed...
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

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 nakasi-factoryrom-release history after reset to jb-dev
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

12 years agoReconcile with jb-release
The Android Open Source Project [Tue, 22 May 2012 20:06:49 +0000 (13:06 -0700)]
Reconcile with jb-release

Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a

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 agoam d7ebcd2f: Merge "Fix 6513486: Extend char limit from 30 to 50. b:6513486" into...
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

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 agoReconcile with jb-release nakasi-factoryrom-release
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

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

12 years agoam c9f743a7: Fix action-bar title for cropping wallpaper.
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.

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 agoam 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev
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().

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 agoam b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J relea...
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

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 agoam cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev
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.

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 agoam bc8d5327: Restore deleted string still referenced from menu resource.
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.

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 agoam a30d822e: Import translations. DO NOT MERGE
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

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 agoReconcile with jb-release nakasi-factoryrom-release
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

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

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 agoam 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow...
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

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 agoam 66e52983: Import translations. DO NOT MERGE
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

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 nakasi-factoryrom-release history after reset to jb-dev
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

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 agoam 00af9fc9: Import translations. DO NOT MERGE
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

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 agoam b79e7627: Import translations. DO NOT MERGE
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

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 agoam dc0e7625: Import translations. DO NOT MERGE
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

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 agoam 3191875f: Import translations. DO NOT MERGE
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

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 agoam b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev
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

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 agoam 92b5162f: Import translations. DO NOT MERGE
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

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 agoam 609a25b9: Merge "Add camera icon for camera roll." into 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.

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 agoam 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
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.

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 agoam d570731b: Import translations. DO NOT MERGE
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

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 agoam f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors.
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.

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 agoam 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev
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

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 agoam 1f0f6c7e: Import translations. DO NOT MERGE
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

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 agoam dd97a122: Increase localization string limit.
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.

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 agoam 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2"
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

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