OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam d69d5b63: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray...
Doris Liu [Mon, 5 Nov 2012 23:39:41 +0000 (15:39 -0800)]
am d69d5b63: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

* commit 'd69d5b639570688122c847898943b1a1bbfa43f0':

11 years agoam 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text.
Ruben Brunk [Mon, 5 Nov 2012 23:39:39 +0000 (15:39 -0800)]
am 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text.

* commit '4adc279a57e3d2436b6861eee760f37a8df2aab9':

11 years agoam 7218147e: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera...
Jason Noguchi [Mon, 5 Nov 2012 23:39:37 +0000 (15:39 -0800)]
am 7218147e: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

* commit '7218147e6d81315245e3a485fb954761af687b2f':

11 years agoam 2709de53: am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations...
Baligh Uddin [Mon, 5 Nov 2012 23:39:35 +0000 (15:39 -0800)]
am 2709de53: am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '2709de537dd57a1ac329b35fc29a165aa1e2ae16':

11 years agoam 19460c5e: (-s ours) am 6e64dcff: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 5 Nov 2012 23:39:34 +0000 (15:39 -0800)]
am 19460c5e: (-s ours) am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '19460c5e8d1bfbdb43c0ec32e05a57458e5561ab':

11 years agoam 8cd8a93e: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transi...
Bobby Georgescu [Mon, 5 Nov 2012 23:38:02 +0000 (15:38 -0800)]
am 8cd8a93e: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

* commit '8cd8a93eae3158f8469026f65e7d31819ae38fab':

11 years agoam 1febb98e: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos...
Doris Liu [Mon, 5 Nov 2012 23:38:01 +0000 (15:38 -0800)]
am 1febb98e: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '1febb98e498f425935cfafdb492283b42ef61c87':

11 years agoam be7c16de: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.
Ruben Brunk [Mon, 5 Nov 2012 23:37:59 +0000 (15:37 -0800)]
am be7c16de: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.

* commit 'be7c16de9647b449ed417ae16315b47aaa143a83':

11 years agoam 1fd563a6: am 04114762: am 6df6841f: Merge "Update video editor actionbar backgroun...
Doris Liu [Mon, 5 Nov 2012 23:37:58 +0000 (15:37 -0800)]
am 1fd563a6: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

* commit '1fd563a6bc183f573f7f44de5aaa55a4fbc1dbb7':

11 years agoam 80e62189: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Change...
Ruben Brunk [Mon, 5 Nov 2012 23:37:56 +0000 (15:37 -0800)]
am 80e62189: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions.  Changed overflow menu to use new editor." into gb-ub-photos-arches

* commit '80e6218918b508f6147c8cc9699df8d338e50a95':

11 years agoam 5acccefe: am e12e6962: am da974d84: fix crash from configurable slider ranges
John Hoford [Mon, 5 Nov 2012 23:37:54 +0000 (15:37 -0800)]
am 5acccefe: am e12e6962: am da974d84: fix crash from configurable slider ranges

* commit '5acccefeadeff7ff09683b165ac1516d733bf75b':

11 years agoam d0b53c08: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter...
Ruben Brunk [Mon, 5 Nov 2012 23:37:53 +0000 (15:37 -0800)]
am d0b53c08: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

* commit 'd0b53c08d88a696170989d6c0c72f8cbb26ac654':

11 years agoam 272546bb: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb...
John Hoford [Mon, 5 Nov 2012 23:37:51 +0000 (15:37 -0800)]
am 272546bb: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit '272546bbbfa29cc0fd273003a071e735631a4766':

11 years agoam 8e71835d: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb...
nicolasroard [Mon, 5 Nov 2012 23:37:50 +0000 (15:37 -0800)]
am 8e71835d: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit '8e71835d2d34e33a1622fbf66308fc0ccfc6f876':

11 years agoam d6d9db90: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded
John Reck [Mon, 5 Nov 2012 23:37:48 +0000 (15:37 -0800)]
am d6d9db90: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded

* commit 'd6d9db90be8b088f80c2023c69fbdc0f9e75b816':

11 years agoam c2c0b1b6: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent retur...
Mangesh Ghiware [Mon, 5 Nov 2012 23:37:46 +0000 (15:37 -0800)]
am c2c0b1b6: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit 'c2c0b1b623a2091d052362e213d7e8e81a772463':

11 years agoam d0ff9e6b: am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations...
Baligh Uddin [Mon, 5 Nov 2012 23:37:45 +0000 (15:37 -0800)]
am d0ff9e6b: am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'd0ff9e6b30fb44a0a9c1984a611703751d682a31':

11 years agoam f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 5 Nov 2012 23:37:43 +0000 (15:37 -0800)]
am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f71589e474392a62a41ab22da3bdd14d078611b8':

11 years agoam 954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 5 Nov 2012 22:11:50 +0000 (14:11 -0800)]
am 954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '954afb2e42b9894676f0e7f9fb9b22d5bcf8825c':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 5 Nov 2012 00:50:29 +0000 (16:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery...
Bart Sears [Fri, 2 Nov 2012 22:38:09 +0000 (15:38 -0700)]
am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit '70fb3773116bacdce3807a6ddfe386b43f4bbe80':
  Lock icon in secure album should redirect to gallery after unlock.

11 years agoam b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock...
Bart Sears [Fri, 2 Nov 2012 22:36:33 +0000 (15:36 -0700)]
am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit 'b41864f13b83a4f2d92f601b2e4381762ad1effa':
  Lock icon in secure album should redirect to gallery after unlock.

11 years agoMerge "Lock icon in secure album should redirect to gallery after unlock." into gb...
Bart Sears [Fri, 2 Nov 2012 22:34:01 +0000 (15:34 -0700)]
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

11 years agoam f350beb8: am 3252800c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:24:09 +0000 (07:24 -0700)]
am f350beb8: am 3252800c: (-s ours) Import translations. DO NOT MERGE

* commit 'f350beb8c64c38b959f27b9b917cdc58fe72868a':
  Import translations. DO NOT MERGE

11 years agoam 3252800c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:21:55 +0000 (07:21 -0700)]
am 3252800c: (-s ours) Import translations. DO NOT MERGE

* commit '3252800c7fe6bdb69b066eae0db739d06cfec64d':
  Import translations. DO NOT MERGE

11 years agoLock icon in secure album should redirect to gallery after unlock.
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.

Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.

bug:7462572

Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:07:22 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie49627da381e12e72468c31322d40bbc3915e7ec
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:07:02 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: I981bbec359bbbf1414a78726bc55c20281ebda0f
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:06:20 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iee5cfc87f61245753889d1cc83f9c9a511449bbe
Auto-generated-cl: translation import

11 years agoam bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub...
George Mount [Thu, 1 Nov 2012 20:42:08 +0000 (13:42 -0700)]
am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

* commit 'bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2':
  Fix extra gray item in secure album.

11 years agoam 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
George Mount [Thu, 1 Nov 2012 20:39:45 +0000 (13:39 -0700)]
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

* commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217':
  Fix extra gray item in secure album.

11 years agoMerge "Fix extra gray item in secure album." into gb-ub-photos-arches
George Mount [Thu, 1 Nov 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

11 years agoam 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video...
Bart Sears [Thu, 1 Nov 2012 20:02:01 +0000 (13:02 -0700)]
am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

* commit '77262bd58f4aba9bdb961c7a9be856502e120fb8':
  Jump to lockscreen in secure album if tap on video

11 years agoam 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub...
Bart Sears [Thu, 1 Nov 2012 20:00:18 +0000 (13:00 -0700)]
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

* commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2':
  Jump to lockscreen in secure album if tap on video

11 years agoMerge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
Bart Sears [Thu, 1 Nov 2012 19:59:00 +0000 (12:59 -0700)]
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

11 years agoam 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 19:57:26 +0000 (12:57 -0700)]
am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore

* commit '452ce867e9d5837ede2e67d75fdaf07fb8ffcd57':
  Fix tiny planet not using XMP metadata anymore

11 years agoam 769d38db: Fix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 19:54:07 +0000 (12:54 -0700)]
am 769d38db: Fix tiny planet not using XMP metadata anymore

* commit '769d38db5736cd690ab7837c0824572739c39184':
  Fix tiny planet not using XMP metadata anymore

11 years agoFix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 17:40:22 +0000 (10:40 -0700)]
Fix extra gray item in secure album.

 Bug 7454444

Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73

11 years agoJump to lockscreen in secure album if tap on video
Angus Kong [Thu, 1 Nov 2012 07:08:44 +0000 (15:08 +0800)]
Jump to lockscreen in secure album if tap on video

bug:7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006

11 years agoFix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 00:21:02 +0000 (17:21 -0700)]
Fix tiny planet not using XMP metadata anymore

 Bug: 7452777

Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.

Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e

11 years agoam 8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 22:01:43 +0000 (15:01 -0700)]
am 8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8405f65e8b3a671562ea215b06ae91512a4734d7':
  Import translations. DO NOT MERGE

11 years agoam f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 22:01:41 +0000 (15:01 -0700)]
am f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f09fa2bf45d92e0284212960d73080d825e39351':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 22:00:49 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 21:59:28 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 31 Oct 2012 16:43:39 +0000 (09:43 -0700)]
am 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '692a8536b790d50c506a7fb9588301eaff5e02c6':
  Import translations. DO NOT MERGE

11 years agoam 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 31 Oct 2012 16:41:08 +0000 (09:41 -0700)]
am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 31 Oct 2012 16:39:55 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 31 Oct 2012 16:39:23 +0000 (09:39 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Wed, 31 Oct 2012 16:19:47 +0000 (09:19 -0700)]
am a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'a65e41a88601586f5bcdc31933bb677af4fab243':
  Import translations. DO NOT MERGE

11 years agoam 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 31 Oct 2012 16:17:52 +0000 (09:17 -0700)]
am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '8d0392d623a88ace36fc4358c0d78e00377ca97f':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 31 Oct 2012 16:16:54 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 31 Oct 2012 16:16:19 +0000 (09:16 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest.
Wu-cheng Li [Wed, 31 Oct 2012 06:50:02 +0000 (23:50 -0700)]
am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest.

* commit '88cef187405439c515fc7c41a0fefe697736521f':
  Add keyguard camera widget meta-data to gallery manifest.

11 years agoam 471d8986: Add keyguard camera widget meta-data to gallery manifest.
Wu-cheng Li [Wed, 31 Oct 2012 06:47:17 +0000 (23:47 -0700)]
am 471d8986: Add keyguard camera widget meta-data to gallery manifest.

* commit '471d898606bc15878b4d1708236f60157bab08df':
  Add keyguard camera widget meta-data to gallery manifest.

11 years agoAdd keyguard camera widget meta-data to gallery manifest.
Wu-cheng Li [Wed, 31 Oct 2012 03:12:05 +0000 (11:12 +0800)]
Add keyguard camera widget meta-data to gallery manifest.

bug:7445471

Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264

11 years agoam 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOr...
Mangesh Ghiware [Wed, 31 Oct 2012 00:40:45 +0000 (17:40 -0700)]
am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem

* commit '0514c285cca2116bb8d07f657cf9c167f87e8bad':
  Change protection level for GALLERY_PROVIDER to signatureOrSystem

11 years agoam 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
Mangesh Ghiware [Wed, 31 Oct 2012 00:38:05 +0000 (17:38 -0700)]
am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem

* commit '589381bffb30f4f4a84ebe59b9bc3a140153831c':
  Change protection level for GALLERY_PROVIDER to signatureOrSystem

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:22:09 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I94a382290cc60de9ed982b1c8420cee050a4fabf
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:21:30 +0000 (17:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1c49a77ba773ca74d6a2a481d811ff9083279fff
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:20:20 +0000 (17:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0d62900eb18a8dfe8c0618c2010c4096208df848
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:17:15 +0000 (17:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5a260559e229c2b2464e07f0194eb2a60f30b4c1
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:15:58 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I35fdf78b795b6316a70ef988f3488ddd64b1a1e7
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 00:14:41 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I788d1bf735ea22a554941398f43c3684e3bb5a6e
Auto-generated-cl: translation import

11 years agoChange protection level for GALLERY_PROVIDER to signatureOrSystem
Mangesh Ghiware [Tue, 30 Oct 2012 22:41:00 +0000 (15:41 -0700)]
Change protection level for GALLERY_PROVIDER to signatureOrSystem

Bug: 7433498
Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5

11 years agoam 3245b90f: am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background...
Tenghui Zhu [Tue, 30 Oct 2012 22:21:06 +0000 (15:21 -0700)]
am 3245b90f: am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '3245b90f56edac635a3bcf7963d71a125d3b4312':
  DO NOT MERGE: Do not set the background to null for video.

11 years agoam 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for...
Tenghui Zhu [Tue, 30 Oct 2012 22:19:12 +0000 (15:19 -0700)]
am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '310db394adcdb8677b9a3d0f37a4abee63bdbb50':
  DO NOT MERGE: Do not set the background to null for video.

11 years agoMerge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos...
Tenghui Zhu [Tue, 30 Oct 2012 22:16:33 +0000 (15:16 -0700)]
Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

11 years agoDO NOT MERGE: Do not set the background to null for video.
Romain Guy [Thu, 4 Oct 2012 01:47:21 +0000 (18:47 -0700)]
DO NOT MERGE: Do not set the background to null for video.

Bug #7275145
Bug 7405595

Removing the window background when it's not visible is a good idea
to save on performance. Removing *all* the backgrounds is just a silly
idea that leads to weird looking results that drive graphics engineers
mad for a day until they figure out that everything is working properly
and that the app is simply asking the system to draw whatever garbage
is left in the GPU's graphics buffers.

Cherry pick the Romain's change from jb-mr1-dev:
https://googleplex-android-review.googlesource.com/#/c/234571/

Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4

11 years agoam 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and...
Bart Sears [Tue, 30 Oct 2012 19:42:44 +0000 (12:42 -0700)]
am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit '3ac3cdd66f291e0e7400204f7410c02cffd24183':
  Show sync error toast only when both loading and syncing are done.

11 years agoam c7536cfa: Merge "Show sync error toast only when both loading and syncing are...
Bart Sears [Tue, 30 Oct 2012 19:40:36 +0000 (12:40 -0700)]
am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327':
  Show sync error toast only when both loading and syncing are done.

11 years agoMerge "Show sync error toast only when both loading and syncing are done." into gb...
Bart Sears [Tue, 30 Oct 2012 19:39:23 +0000 (12:39 -0700)]
Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

11 years agoam 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photo...
George Mount [Tue, 30 Oct 2012 18:37:28 +0000 (11:37 -0700)]
am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit '14a53420ee67fe971455d715af324266643ba0de':
  Don't use an album for UriImages.

11 years agoam aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches
George Mount [Tue, 30 Oct 2012 18:35:11 +0000 (11:35 -0700)]
am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit 'aa8228a42b25b60f0663770beea9acdce536f699':
  Don't use an album for UriImages.

11 years agoMerge "Don't use an album for UriImages." into gb-ub-photos-arches
George Mount [Tue, 30 Oct 2012 18:33:21 +0000 (11:33 -0700)]
Merge "Don't use an album for UriImages." into gb-ub-photos-arches

11 years agoShow sync error toast only when both loading and syncing are done.
Hung-ying Tyan [Tue, 30 Oct 2012 09:47:35 +0000 (17:47 +0800)]
Show sync error toast only when both loading and syncing are done.

Bug: 7427597
Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c

11 years agoDon't use an album for UriImages.
George Mount [Mon, 29 Oct 2012 21:54:17 +0000 (14:54 -0700)]
Don't use an album for UriImages.

 Bug 7422455

Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6

11 years agoam 1a2512cf: am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 29 Oct 2012 21:44:15 +0000 (14:44 -0700)]
am 1a2512cf: am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '1a2512cf1adf71c8a89e18eca40bef5bcc9fc451':
  Import translations. DO NOT MERGE

11 years agoam 115299f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:44:14 +0000 (14:44 -0700)]
am 115299f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '115299f04552f97b019c45f1625a24b2c49b7a17':
  Import translations. DO NOT MERGE

11 years agoam 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 29 Oct 2012 21:43:00 +0000 (14:43 -0700)]
am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:41:26 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 29 Oct 2012 21:41:13 +0000 (14:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 29 Oct 2012 21:40:36 +0000 (14:40 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam b3e7d7d8: am dc03ae14: Reset rotation flag
nicolasroard [Mon, 29 Oct 2012 21:12:16 +0000 (14:12 -0700)]
am b3e7d7d8: am dc03ae14: Reset rotation flag

* commit 'b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497':
  Reset rotation flag

11 years agoam ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches
nicolasroard [Mon, 29 Oct 2012 21:12:14 +0000 (14:12 -0700)]
am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit 'ddc54044bfa994db4160442ff74b4ddf2e228681':
  Fix zooming position

11 years agoam 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter
John Hoford [Mon, 29 Oct 2012 21:12:12 +0000 (14:12 -0700)]
am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '031a07411e4ad53fe76c4ef6ed39d62dd429e406':
  Do not copy XMP data if it has TinyPlanet filter

11 years agoam fbab7ba5: am 49af06e2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:11:51 +0000 (14:11 -0700)]
am fbab7ba5: am 49af06e2: (-s ours) Import translations. DO NOT MERGE

* commit 'fbab7ba54617493dc47082b0bb16496eeedc1560':
  Import translations. DO NOT MERGE

11 years agoam b3e89cab: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 21:11:50 +0000 (14:11 -0700)]
am b3e89cab: Import translations. DO NOT MERGE

* commit 'b3e89cab1ee57cb1cef8a69b295ad4c15a7f3ebc':
  Import translations. DO NOT MERGE

11 years agoam 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:11:36 +0000 (14:11 -0700)]
am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5ac0bdabc6be6b411b001aeabcc5ae6702251925':
  Import translations. DO NOT MERGE

11 years agoam 10f64ff1: am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 29 Oct 2012 21:07:56 +0000 (14:07 -0700)]
am 10f64ff1: am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '10f64ff122ed917a19776256eb995637d00881c0':
  Import translations. DO NOT MERGE

11 years agoam 8275abe7: am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 29 Oct 2012 21:07:55 +0000 (14:07 -0700)]
am 8275abe7: am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '8275abe7a2d71107087a111b527336068ed28f7e':
  Import translations. DO NOT MERGE

11 years agoam 1cf344e2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 21:07:54 +0000 (14:07 -0700)]
am 1cf344e2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '1cf344e2719c75f0590fd3ed13ec42820f97e29a':
  Import translations. DO NOT MERGE

11 years agoam 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet
nicolasroard [Mon, 29 Oct 2012 21:02:19 +0000 (14:02 -0700)]
am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet

* commit '33d33c7ee22b02dc87085014fc178e0a80b946bb':
  Fix rounding issue affecting TinyPlanet

11 years agoam 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to...
Nicolas Roard [Mon, 29 Oct 2012 21:01:54 +0000 (14:01 -0700)]
am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

* commit '90af32fb05b7c2be9807d6b53bd61b4093ed0e00':
  Changed rotated display parameter increments to 90.

11 years agoam d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub...
Nicolas Roard [Mon, 29 Oct 2012 21:01:53 +0000 (14:01 -0700)]
am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

* commit 'd2a1f33fdcf77073f80c144eaaed24f4d28ab373':
  change thumbnail and reset behaviour

11 years agoam f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into...
Doris Liu [Mon, 29 Oct 2012 21:01:52 +0000 (14:01 -0700)]
am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

* commit 'f245d2b716fdc26b59f1251bf55707cdc06c331a':
  Show panoViewer icon after "Back" from viewer

11 years agoam 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after...
George Mount [Mon, 29 Oct 2012 20:56:08 +0000 (13:56 -0700)]
am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.

* commit '6027d7638a2a9445a2a4bbef364d9c02982ffd0b':
  Remove black borders in Manta LightCycle capture after orientation change.

11 years agoam 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into...
Bobby Georgescu [Mon, 29 Oct 2012 20:55:43 +0000 (13:55 -0700)]
am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '2c8a24680ad88ab0028451716bff215aa6e91576':
  Fix the black lines near edge of thumbnails

11 years agoam dc03ae14: Reset rotation flag
nicolasroard [Mon, 29 Oct 2012 17:05:20 +0000 (10:05 -0700)]
am dc03ae14: Reset rotation flag

* commit 'dc03ae144d838714446b239f2b0c519d956af6ff':
  Reset rotation flag

11 years agoReset rotation flag
nicolasroard [Mon, 29 Oct 2012 16:35:47 +0000 (09:35 -0700)]
Reset rotation flag

bug:7386221
Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de

11 years agoam 98990049: Merge "Fix zooming position" into gb-ub-photos-arches
nicolasroard [Mon, 29 Oct 2012 15:55:50 +0000 (08:55 -0700)]
am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit '98990049451cda3540f6cff1ae8065c3675ed3d8':
  Fix zooming position